diff options
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/gpsd/files/gpsd | 21 | ||||
| -rw-r--r-- | packages/gpsd/files/om-gta02/gpsd-default | 3 | ||||
| -rw-r--r-- | packages/gpsd/gpsd_2.34.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-sound-system2/session | 1 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-sound-system2_0.1.0.bb | 4 | ||||
| -rw-r--r-- | packages/resolvconf/resolvconf_1.28.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko-feed.bb | 6 |
7 files changed, 15 insertions, 25 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/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 8e46cb01eb..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" +PR = "r10" 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" 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/ diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index ab11f61f81..3b02d4936c 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r54" +PR = "r55" inherit task @@ -66,7 +66,6 @@ RDEPENDS_task-openmoko-feed = "\ tangogps \ pyefl-sudoku \ minicom \ - vim \ iotop \ evince \ epdfview \ @@ -110,10 +109,9 @@ RDEPENDS_task-openmoko-feed = "\ iproute2 \ iputils \ psmisc \ - tar \ - coreutils \ debianutils \ tcptraceroute \ + task-proper-tools \ # dnsutils/bind-tools for dig, nslookup is still missing \ font-adobe-100dpi \ font-adobe-75dpi \ |