From 1e1dc41f8dd677f94b063ad7397e8ce1d0608f26 Mon Sep 17 00:00:00 2001 From: Julian_chu Date: Thu, 25 Sep 2008 18:07:06 +0800 Subject: gpsd: Modify gpsd daemon script to use start-stop-daemon --- packages/gpsd/files/gpsd | 21 +++++---------------- packages/gpsd/gpsd_2.34.bb | 2 +- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd index e536837e1c..91f09c1b75 100755 --- a/packages/gpsd/files/gpsd +++ b/packages/gpsd/files/gpsd @@ -10,6 +10,7 @@ #. /etc/rc.d/init.d/functions RETVAL=0 +DAEMON=/usr/sbin/gpsd prog="gpsd" test -f /etc/default/$prog && . /etc/default/$prog @@ -40,29 +41,24 @@ start() { if [ -e "${GPS_DEV}" ] then - gpsd ${GPSD_OPTS} ${GPS_DEV} - echo "success" + start-stop-daemon -S -x ${DAEMON} -- ${GPSD_OPTS} ${GPS_DEV} + echo "success" else # User needs to symlink ${GPS_DEV} to the right thing echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog" fi RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gpsd return $RETVAL } stop() { # Stop daemons. echo -n "Shutting down $prog: " - killall gpsd + start-stop-daemon -K -x ${DAEMON} # killproc gpsd RETVAL=$? echo - if [ $RETVAL -eq 0 ] - then - rm -f /var/lock/subsys/gpsd; - fi return $RETVAL } @@ -79,19 +75,12 @@ case "$1" in start RETVAL=$? ;; - condrestart) - if [ -f /var/lock/subsys/gpsd ]; then - stop - start - RETVAL=$? - fi - ;; status) # status gpsd # RETVAL=$? ;; *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" + echo "Usage: $0 {start|stop|restart|status}" exit 1 esac diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 8e46cb01eb..16b528fd80 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r9" +PR = "r9.01" -- cgit v1.2.3 From 5135f2aa507ec3c7f5e35bb9dc91f379c5f74b96 Mon Sep 17 00:00:00 2001 From: Julian_chu Date: Thu, 25 Sep 2008 17:21:36 +0800 Subject: [gpsd] change gpsd device file from /dev/ttyS3 to /dev/ttySAC1 gpsd-default describe the GPS device is /dev/ttyS3, but for GTA01/GTA02 it should be /dev/ttySAC1. --- packages/gpsd/files/gpsd-default | 2 +- packages/gpsd/gpsd_2.34.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gpsd/files/gpsd-default b/packages/gpsd/files/gpsd-default index c345edf974..be43103412 100644 --- a/packages/gpsd/files/gpsd-default +++ b/packages/gpsd/files/gpsd-default @@ -1,3 +1,3 @@ # If you must specify a non-NMEA driver, uncomment and modify the next line #GPSD_OPTS= -GPS_DEV="/dev/ttyS3" +GPS_DEV="/dev/ttySAC1" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 16b528fd80..673d9c65be 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r9.01" +PR = "r9.02" -- cgit v1.2.3 From bf58878bcc8040df707e0e48ba5ac3636f08ae9e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 16 Nov 2008 16:40:06 +0100 Subject: gpsd: Only change gpsd-default for the om-gta02 machine Fix up the previous commit. --- packages/gpsd/files/gpsd-default | 2 +- packages/gpsd/files/om-gta02/gpsd-default | 3 +++ packages/gpsd/gpsd_2.34.bb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 packages/gpsd/files/om-gta02/gpsd-default diff --git a/packages/gpsd/files/gpsd-default b/packages/gpsd/files/gpsd-default index be43103412..c345edf974 100644 --- a/packages/gpsd/files/gpsd-default +++ b/packages/gpsd/files/gpsd-default @@ -1,3 +1,3 @@ # If you must specify a non-NMEA driver, uncomment and modify the next line #GPSD_OPTS= -GPS_DEV="/dev/ttySAC1" +GPS_DEV="/dev/ttyS3" diff --git a/packages/gpsd/files/om-gta02/gpsd-default b/packages/gpsd/files/om-gta02/gpsd-default new file mode 100644 index 0000000000..be43103412 --- /dev/null +++ b/packages/gpsd/files/om-gta02/gpsd-default @@ -0,0 +1,3 @@ +# If you must specify a non-NMEA driver, uncomment and modify the next line +#GPSD_OPTS= +GPS_DEV="/dev/ttySAC1" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 673d9c65be..4f4e3a3a78 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r9.02" +PR = "r10" -- cgit v1.2.3 From 4cb5524f665b6aca589a09295201693f2c5213ae Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 3 Sep 2008 18:30:27 +0800 Subject: openmoko-sound-system2: make pulseaudio stops listening for TCP by default trac #1855: PulseAudio insecurely listens for TCP originated by RuiSeabra --- packages/openmoko2/openmoko-sound-system2/session | 1 - packages/openmoko2/openmoko-sound-system2_0.1.0.bb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session index 7ba07e9784..7cc4d49ea3 100644 --- a/packages/openmoko2/openmoko-sound-system2/session +++ b/packages/openmoko2/openmoko-sound-system2/session @@ -6,7 +6,6 @@ add-autoload-source input module-alsa-source source_name=input # Load several protocols load-module module-esound-protocol-unix -load-module module-simple-protocol-tcp load-module module-native-protocol-unix load-module module-cli-protocol-unix diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb index 33cd5648d4..ec45bfa641 100644 --- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb +++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -13,7 +13,7 @@ RDEPENDS = "\ " RREPLACES = "openmoko-sound-system" RPROVIDES = "openmoko-sound-system" -PR = "r5" +PR = "r5.01" inherit openmoko-base update-rc.d @@ -28,7 +28,7 @@ do_install() { install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/ install -d ${D}/${sysconfdir}/pulse - install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session + install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session } PACKAGE_ARCH = "all" -- cgit v1.2.3 From b8bb4647b43017e32788b7575bad70b77e11ab1b Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 18 Jun 2008 15:02:24 +0800 Subject: resolvconf: fix resolvconf to actually work and fix up resolv.conf file properly by adding in directory into package --- packages/resolvconf/resolvconf_1.28.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/resolvconf/resolvconf_1.28.bb b/packages/resolvconf/resolvconf_1.28.bb index 2aa2fccc8b..48017bce27 100644 --- a/packages/resolvconf/resolvconf_1.28.bb +++ b/packages/resolvconf/resolvconf_1.28.bb @@ -9,7 +9,7 @@ AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" DEPENDS = "bash" RDEPENDS = "bash" -PR = "r1" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" @@ -21,6 +21,7 @@ do_install () { install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface install -d ${D}${mandir}/man8 ${D}${docdir}/${P} cp -pPR etc/* ${D}${sysconfdir}/ + mkdir -p ${D}${sysconfdir}/resolvconf/run/interface install -m 0755 bin/resolvconf ${D}${base_sbindir}/ install -m 0644 README ${D}${docdir}/${P}/ install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ -- cgit v1.2.3