[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-322-ge2665b5

[Julien B a. A. <ar...@us...>]

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  e2665b5cc15ffd8d0e3f3bc58cbb7e2a5d239662 (commit)
      from  7959a7b97f03a71d631e6152e0ef0b7f7e3211e1 (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 e2665b5cc15ffd8d0e3f3bc58cbb7e2a5d239662
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jul 21 21:36:50 2013 +0200

    [BUILDROOT] gpsd: add the possibility to define other options than serial device.

-----------------------------------------------------------------------

Summary of changes:
 ...us-gpsd-add-options-setting-in-menuconfig.patch |   48 ++++++++++++++++++++
 patches/buildroot/2013.05/cleanup_buildroot.sh     |    1 +
 2 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2013.05/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch

diff --git a/patches/buildroot/2013.05/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2013.05/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
new file mode 100644
index 0000000..b8d330e
--- /dev/null
+++ b/patches/buildroot/2013.05/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
@@ -0,0 +1,48 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gpsd/Config.in
+===================================================================
+--- buildroot.orig/package/gpsd/Config.in	2013-07-21 21:14:36.234513938 +0200
++++ buildroot/package/gpsd/Config.in	2013-07-21 21:15:57.658917706 +0200
+@@ -21,6 +21,11 @@
+ 	default "/dev/ttyS1"
+ 	depends on BR2_PACKAGE_GPSD
+ 
++config BR2_PACKAGE_GPSD_OPTIONS
++	string "Daemon options"
++	default ""
++	depends on BR2_PACKAGE_GPSD
++
+ menu "Features"
+ 	depends on BR2_PACKAGE_GPSD
+ 
+Index: buildroot/package/gpsd/gpsd.mk
+===================================================================
+--- buildroot.orig/package/gpsd/gpsd.mk	2013-07-21 21:16:10.402980889 +0200
++++ buildroot/package/gpsd/gpsd.mk	2013-07-21 21:19:50.036069999 +0200
+@@ -210,6 +210,7 @@
+ 	if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
+ 		$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
+ 		$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
++		$(SED) 's,^OTHER_OPTIONS=.*,OTHER_OPTIONS=$(BR2_PACKAGE_GPSD_OPTIONS),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
+ 	fi
+ endef
+ 
+Index: buildroot/package/gpsd/S50gpsd
+===================================================================
+--- buildroot.orig/package/gpsd/S50gpsd	2013-07-21 21:23:50.417261978 +0200
++++ buildroot/package/gpsd/S50gpsd	2013-07-21 21:24:03.445326591 +0200
+@@ -7,10 +7,12 @@
+ DAEMON=/usr/sbin/$NAME
+ DEVICES=/dev/ttyS1
+ PIDFILE=/var/run/$NAME.pid
++OTHER_OPTIONS=
++DAEMON_OPTIONS="-P $PIDFILE $DEVICES $OTHER_OPTIONS"
+ 
+ start() {
+         echo -n "Starting $NAME: "
+-        start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
++        start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- $DAEMON_OPTIONS && echo "OK" || echo "Failed"
+ }
+ stop() {
+         echo -n "Stopping $NAME: "
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index a8f096f..3d2ad78 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -78,3 +78,4 @@ rm -f buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patc
 rm -f buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patch
 rm -f buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
 rm -rf buildroot/package/joe/
+rm -rf buildroot/package/gpsd/


hooks/post-receive
-- 
armadeus