From d8babc1e89beb0169e9fe0ec0a02d0078e448b89 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Fri, 7 Sep 2007 14:23:24 +0000 Subject: angstrom-minimal-image-with-mtd-utils: change RDEPENDS to IMAGE_INSTALL --- packages/images/angstrom-minimal-image-with-mtd-utils.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/images/angstrom-minimal-image-with-mtd-utils.bb b/packages/images/angstrom-minimal-image-with-mtd-utils.bb index 740c39126c..4fe33e9282 100644 --- a/packages/images/angstrom-minimal-image-with-mtd-utils.bb +++ b/packages/images/angstrom-minimal-image-with-mtd-utils.bb @@ -3,7 +3,7 @@ # to program the NAND flash. require angstrom-minimal-image.bb -RDEPENDS += "mtd-utils" +IMAGE_INSTALL += "mtd-utils" export IMAGE_BASENAME = "minimalist-image-mtdutils" -- cgit v1.2.3 From cb028129efb450efe57757b2ea73e8cd827bf59d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Sep 2007 15:08:00 +0000 Subject: dbus: remove --reverse (yes, that is bad) to fix shutting down of dbus services on halt/reboot --- packages/dbus/dbus-1.0.2/dbus-1.init | 2 +- packages/dbus/dbus_1.0.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init index 38e7574ad5..46e321860d 100644 --- a/packages/dbus/dbus-1.0.2/dbus-1.init +++ b/packages/dbus/dbus-1.0.2/dbus-1.init @@ -62,7 +62,7 @@ start_it_up() shut_it_down() { if [ -d $EVENTDIR ]; then - run-parts --reverse --arg=stop $EVENTDIR + run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " start-stop-daemon --stop --quiet --pidfile $PIDFILE \ diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index a660eb1586..0c97e30406 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -2,4 +2,4 @@ require dbus.inc SRC_URI += " file://fix-waitpid.patch;patch=1" -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 5b01b27522b32b4ee14588764768a33ff7312a3a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Sep 2007 20:13:11 +0000 Subject: tcpdump: update to 3.9.7 whic do not need libpcap 0.9.3 but builds with 0.9.6 --- packages/tcpdump/tcpdump_3.9.3.bb | 21 --------------------- packages/tcpdump/tcpdump_3.9.7.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 packages/tcpdump/tcpdump_3.9.3.bb create mode 100644 packages/tcpdump/tcpdump_3.9.7.bb diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb deleted file mode 100644 index 7ffcc9a37f..0000000000 --- a/packages/tcpdump/tcpdump_3.9.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -SECTION = "console/network" -PRIORITY = "optional" -DEPENDS = "libpcap-0.9.3" -PR = "r2" - -SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://tcpdump_configure_no_-O2.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--without-crypto" - -do_configure() { - gnu-configize - oe_runconf - sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile - sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile -} diff --git a/packages/tcpdump/tcpdump_3.9.7.bb b/packages/tcpdump/tcpdump_3.9.7.bb new file mode 100644 index 0000000000..ba9710d86a --- /dev/null +++ b/packages/tcpdump/tcpdump_3.9.7.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "console/network" +PRIORITY = "optional" +DEPENDS = "libpcap" + +SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--without-crypto" + +do_configure() { + gnu-configize + oe_runconf + sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile + sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile +} -- cgit v1.2.3 From 8a00555b71e47ee86e8449a8f44b7e16c3cef1ae Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Sep 2007 20:22:38 +0000 Subject: base.bbclass: change message about lack of checksums.ini entry for URI to something easier to understand --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index d4b327e266..999d409914 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -487,9 +487,9 @@ python base_do_fetch() { try: if not base_chk_file(parser, pn, pv,uri, localpath, d): if type != "file": - bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) else: - bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) except Exception: raise bb.build.FuncFailed("Checksum of '%s' failed" % uri) } -- cgit v1.2.3 From 6df7b6c8ef449b4d70ff6fce2871ba1bc48ad248 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 7 Sep 2007 21:11:21 +0000 Subject: opentapi: Remove as superseeded by ezxd --- conf/distro/include/sane-srcrevs.inc | 1 - conf/machine/include/motorola-ezx-base.inc | 4 +- packages/ezx/ezxd_svn.bb | 5 +- packages/ezx/opentapi/.mtn2git_empty | 0 packages/ezx/opentapi/opentapi.init | 84 ------------------------------ packages/ezx/opentapi_svn.bb | 28 ---------- 6 files changed, 3 insertions(+), 119 deletions(-) delete mode 100644 packages/ezx/opentapi/.mtn2git_empty delete mode 100644 packages/ezx/opentapi/opentapi.init delete mode 100644 packages/ezx/opentapi_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 27ce277965..de00bfb30a 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -68,7 +68,6 @@ SRCREV_pn-openmoko-theme-standard-qvga="2370" SRCREV_pn-openmoko-today="2556" SRCREV_pn-openmoko-today2="2919" SRCREV_pn-openmoko-today2-folders="2680" -SRCREV_pn-opentapi="2012" SRCREV_pn-sphyrna="43" SRCREV_pn-webkit-gtk="webcore" SRCREV_pn-xoo="1623" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 52b9ccc65d..95496b3266 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -15,7 +15,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" -# the EZX phones need a userspace daemon to stop the BP from shutting down the phone +# the EZX phones need a userspace daemon to stop the BP from shutting down the phone MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd" MACHINE_DISPLAY_WIDTH_PIXELS = "240" @@ -27,7 +27,7 @@ ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" -# Opentapi needs to be started very early so we need the mux devices in static /dev +# Ezxd needs to be started very early so we need the mux devices in static /dev IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \ files/device_table-ezx.txt" diff --git a/packages/ezx/ezxd_svn.bb b/packages/ezx/ezxd_svn.bb index 3a052174b2..9aed2a4465 100644 --- a/packages/ezx/ezxd_svn.bb +++ b/packages/ezx/ezxd_svn.bb @@ -15,9 +15,6 @@ inherit update-rc.d INITSCRIPT_NAME = "ezxd" INITSCRIPT_PARAMS = "start 00 S ." -RREPLACES = "opentapi" - - S = "${WORKDIR}/${PN}" do_install() { @@ -26,7 +23,7 @@ do_install() { install -d ${D}${libdir}/ezxd install -m 755 *.so ${D}${libdir}/ezxd - + install -d ${D}${sysconfdir}/init.d install -m 0600 ezxd.conf ${D}${sysconfdir}/ install -m 0755 ${WORKDIR}/ezxd.init ${D}${sysconfdir}/init.d/ezxd diff --git a/packages/ezx/opentapi/.mtn2git_empty b/packages/ezx/opentapi/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ezx/opentapi/opentapi.init b/packages/ezx/opentapi/opentapi.init deleted file mode 100644 index 0b41418e00..0000000000 --- a/packages/ezx/opentapi/opentapi.init +++ /dev/null @@ -1,84 +0,0 @@ -#! /bin/sh -# -*- coding: utf-8 -*- -# init.d script for opentapi - -set -e - -DAEMON=/usr/bin/opentapi -NAME=opentapi -PIDDIR=/var/run/opentapi -PIDFILE=$PIDDIR/pid -DESC="OpenTAPI server" - -test -x $DAEMON || exit 0 - -# Source defaults file; edit that file to configure this script. -ENABLED=1 -PARAMS="" -if [ -e /etc/default/opentapi ]; then - . /etc/default/opentapi -fi - -test "$ENABLED" != "0" || exit 0 - -start_it_up() -{ - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - fi - if [ -e $PIDFILE ]; then - PIDDIR=/proc/$(cat $PIDFILE) - if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then - echo "$DESC already started; not starting." - else - echo "Removing stale PID file $PIDFILE." - rm -f $PIDFILE - fi - fi - - echo -n "Starting $DESC: " - start-stop-daemon --start --background --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- --system $PARAMS - # We need to sleep here because opening the mux devices takes some time - sleep 15 - echo "$NAME." - if [ -d $EVENTDIR ]; then - run-parts --arg=start $EVENTDIR - fi -} - -shut_it_down() -{ - if [ -d $EVENTDIR ]; then - run-parts --reverse --arg=stop $EVENTDIR - fi - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE - - # We no longer include these arguments so that start-stop-daemon - # can do its job even given that we may have been upgraded. - # We rely on the pidfile being sanely managed - # --exec $DAEMON -- --system $PARAMS - echo "$NAME." - rm -f $PIDFILE -} - -case "$1" in - start) - start_it_up - ;; - stop) - shut_it_down - ;; - restart|force-reload) - shut_it_down - sleep 1 - start_it_up - ;; - *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb deleted file mode 100644 index 7426dfe853..0000000000 --- a/packages/ezx/opentapi_svn.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Open implementation of motorola's tapisrv" -LICENSE = "GPLv2" -SECTION = "devel" -AUTHOR = "Daniel Willmann" - -PV = "0.0+svnr${SRCREV}" -PR = "r3" - -SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ - file://opentapi.init \ - " - -inherit update-rc.d - -INITSCRIPT_NAME = "opentapi" -INITSCRIPT_PARAMS = "start 00 S ." - - -S = "${WORKDIR}/${PN}" - -do_install() { - install -d ${D}${bindir} - install -m 755 opentapi ${D}${bindir} - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/opentapi.init ${D}${sysconfdir}/init.d/opentapi -} - -- cgit v1.2.3