[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-295-g29f58cc
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-295-g29f58cc
|
From: Julien B a. A. <ar...@us...> - 2013-06-28 09:27:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 29f58cc4bf27926b0e993869510e2905b2c9540c (commit)
from 9705cf4c120c3f20997ee416659ef7775d5f5257 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 29f58cc4bf27926b0e993869510e2905b2c9540c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 28 11:24:37 2013 +0200
[BUILDROOT] 2013.05: add SMS Server Tools 3 package
-----------------------------------------------------------------------
Summary of changes:
...3-armadeus-add_sms_server_tools_3_package.patch | 53 ++++++++++++-------
patches/buildroot/2013.05/cleanup_buildroot.sh | 1 +
2 files changed, 34 insertions(+), 20 deletions(-)
copy patches/buildroot/{2012.02 => 2013.05}/203-armadeus-add_sms_server_tools_3_package.patch (66%)
diff --git a/patches/buildroot/2012.02/203-armadeus-add_sms_server_tools_3_package.patch b/patches/buildroot/2013.05/203-armadeus-add_sms_server_tools_3_package.patch
similarity index 66%
copy from patches/buildroot/2012.02/203-armadeus-add_sms_server_tools_3_package.patch
copy to patches/buildroot/2013.05/203-armadeus-add_sms_server_tools_3_package.patch
index 6dd837b..2bf3412 100644
--- a/patches/buildroot/2012.02/203-armadeus-add_sms_server_tools_3_package.patch
+++ b/patches/buildroot/2013.05/203-armadeus-add_sms_server_tools_3_package.patch
@@ -2,21 +2,21 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2013-04-11 22:32:52.000000000 +0200
-+++ buildroot/package/Config.in 2013-04-11 22:33:41.000000000 +0200
-@@ -542,6 +542,7 @@
- source "package/rsync/Config.in"
+--- buildroot.orig/package/Config.in 2013-06-27 12:16:04.215971392 +0200
++++ buildroot/package/Config.in 2013-06-27 18:05:38.433322781 +0200
+@@ -790,6 +790,7 @@
source "package/samba/Config.in"
+ source "package/sconeserver/Config.in"
source "package/ser2net/Config.in"
+source "package/smstools3/Config.in"
source "package/socat/Config.in"
+ source "package/socketcand/Config.in"
source "package/spawn-fcgi/Config.in"
- source "package/squid/Config.in"
Index: buildroot/package/smstools3/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/smstools3/Config.in 2013-04-11 22:32:00.000000000 +0200
-@@ -0,0 +1,13 @@
++++ buildroot/package/smstools3/Config.in 2013-06-27 17:10:44.972991396 +0200
+@@ -0,0 +1,17 @@
+config BR2_PACKAGE_SMSTOOLS3
+ bool "smstools3"
+ help
@@ -25,16 +25,20 @@ Index: buildroot/package/smstools3/Config.in
+
+ http://smstools3.kekekasvi.com/
+
-+
+config BR2_PACKAGE_SMSTOOLS3_NB_MODEMS
+ depends on BR2_PACKAGE_SMSTOOLS3
+ string "Number of modems to support"
+ default 1
++
++config BR2_PACKAGE_SMSTOOLS3_START_AT_BOOT
++ depends on BR2_PACKAGE_SMSTOOLS3
++ bool "Start SMS Server Tools at system boot"
++ default y
Index: buildroot/package/smstools3/smstools3.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/smstools3/smstools3.mk 2013-04-11 22:52:28.000000000 +0200
-@@ -0,0 +1,32 @@
++++ buildroot/package/smstools3/smstools3.mk 2013-06-27 18:47:03.177643968 +0200
+@@ -0,0 +1,36 @@
+#############################################################
+#
+# SMS Server Tools 3
@@ -45,10 +49,14 @@ Index: buildroot/package/smstools3/smstools3.mk
+SMSTOOLS3_SITE = http://smstools3.kekekasvi.com/packages/
+
+SMSTOOLS3_NB_MODEMS = $(call qstrip,$(BR2_PACKAGE_SMSTOOLS3_NB_MODEMS))
-+
+SMSTOOLS3_CFLAGS = $(TARGET_CFLAGS)
+SMSTOOLS3_CFLAGS += -D NUMBER_OF_MODEMS=$(SMSTOOLS3_NB_MODEMS)
+SMSTOOLS3_CFLAGS += -D NOSTATS
++ifeq ($(BR2_PACKAGE_SMSTOOLS3_START_AT_BOOT),y)
++SMSTOOLS3_INIT_SCRIPT_NAME = S50smsd
++else
++SMSTOOLS3_INIT_SCRIPT_NAME = 50smsd
++endif
+
+define SMSTOOLS3_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(SMSTOOLS3_CFLAGS)" -C $(@D)
@@ -58,33 +66,37 @@ Index: buildroot/package/smstools3/smstools3.mk
+ mkdir -p $(TARGET_DIR)/usr/local/bin
+ cp $(@D)/src/smsd $(TARGET_DIR)/usr/local/bin
+ cp $(@D)/scripts/sendsms $(TARGET_DIR)/usr/local/bin
-+ cp $(@D)/examples/smsd.conf.easy $(TARGET_DIR)/etc/smsd.conf
-+ $(INSTALL) -m 0755 -D package/smstools3/S50smsd $(TARGET_DIR)/etc/init.d/S50smsd
++ cp $(@D)/examples/smsd.conf.easy $(TARGET_DIR)/etc/
++ $(INSTALL) -m 0755 -D package/smstools3/S50smsd $(TARGET_DIR)/etc/init.d/$(SMSTOOLS3_INIT_SCRIPT_NAME)
+endef
+
+define SMSTOOLS3_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
-+$(eval $(call GENTARGETS))
++$(eval $(generic-package))
Index: buildroot/package/smstools3/S50smsd
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/smstools3/S50smsd 2013-04-11 22:49:28.000000000 +0200
-@@ -0,0 +1,38 @@
++++ buildroot/package/smstools3/S50smsd 2013-06-27 18:40:41.399750832 +0200
+@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Starts the SMS Server Tools 3
+#
+
+NAME=smsd
-+DAEMON=/usr//local/bin/$NAME
++DAEMON=/usr/local/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
++SPOOL=/var/spool/sms
+
+start()
+{
+ echo -n "Starting $NAME: "
-+ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
++ mkdir -p $SPOOL/outgoing
++ mkdir -p $SPOOL/incoming
++ mkdir -p $SPOOL/checked
++ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -c /etc/smsd.conf && echo "OK" || echo "Failed"
+}
+
+stop()
@@ -102,10 +114,11 @@ Index: buildroot/package/smstools3/S50smsd
+ stop
+ ;;
+ restart|reload)
-+ restart
++ start
++ stop
+ ;;
+ *)
-+ echo $"Usage: $0 {start|stop|restart}"
++ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
+
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 12e7553..fdd014e 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -68,6 +68,7 @@ rm -rf buildroot/package/qtcreator/
rm -rf buildroot/package/marble/
rm -rf buildroot/package/cunit/
rm -rf buildroot/package/gnokii/
+rm -rf buildroot/package/smstools3/
rm -rf buildroot/package/wpa_supplicant/
rm -f buildroot/package/busybox/1.19.4/busybox-1.19.4-stty_add_rs485_config.patch
rm -f buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patch
hooks/post-receive
--
armadeus
|
