From 963292b280b5c5158f47086c3425b6aa11c8ed15 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 17:12:53 +0000 Subject: python 2.5.2 silence sitecustomize.py --- packages/python/python-2.5.2/sitecustomize.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/python/python-2.5.2/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py index 4c0ba3f0da..ec626b4b63 100644 --- a/packages/python/python-2.5.2/sitecustomize.py +++ b/packages/python/python-2.5.2/sitecustomize.py @@ -37,9 +37,8 @@ import sys try: import rlcompleter, readline except ImportError: - sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py not active. Please install python-readline.\n" % sys.version.split()[0] ) + pass else: __enableDefaultEncoding() __registerExitHandler() __enableReadlineSupport() - sys.stderr.write( "Python %s (OpenEmbedded build) sitecustomize.py active.\n" % sys.version.split()[0] ) -- cgit v1.2.3 From 1362b18695cc799af345ecc9de591a20eaab1a41 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 18:08:17 +0000 Subject: dbus 1.1.4 update to 1.1.20 (new default version) --- packages/dbus/dbus-1.1.20/.mtn2git_empty | 0 packages/dbus/dbus-1.1.20/cross.patch | 10 ++ packages/dbus/dbus-1.1.20/dbus-1.init | 110 +++++++++++++++++++++ .../dbus/dbus-1.1.20/fix-dbus-launch-x11.patch | 14 +++ packages/dbus/dbus-1.1.20/fix-install-daemon.patch | 13 +++ packages/dbus/dbus-1.1.20/tmpdir.patch | 30 ++++++ packages/dbus/dbus-1.1.4/.mtn2git_empty | 0 packages/dbus/dbus-1.1.4/cross.patch | 10 -- packages/dbus/dbus-1.1.4/dbus-1.init | 110 --------------------- packages/dbus/dbus-1.1.4/fix-install-daemon.patch | 13 --- packages/dbus/dbus-1.1.4/tmpdir.patch | 30 ------ packages/dbus/dbus-native_1.0.2.bb | 4 +- packages/dbus/dbus-native_1.1.20.bb | 26 +++++ packages/dbus/dbus-native_1.1.4.bb | 25 ----- packages/dbus/dbus.inc | 4 +- packages/dbus/dbus_1.0.2.bb | 6 +- packages/dbus/dbus_1.1.20.bb | 5 + packages/dbus/dbus_1.1.4.bb | 3 - 18 files changed, 213 insertions(+), 200 deletions(-) create mode 100644 packages/dbus/dbus-1.1.20/.mtn2git_empty create mode 100644 packages/dbus/dbus-1.1.20/cross.patch create mode 100644 packages/dbus/dbus-1.1.20/dbus-1.init create mode 100644 packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch create mode 100644 packages/dbus/dbus-1.1.20/fix-install-daemon.patch create mode 100644 packages/dbus/dbus-1.1.20/tmpdir.patch delete mode 100644 packages/dbus/dbus-1.1.4/.mtn2git_empty delete mode 100644 packages/dbus/dbus-1.1.4/cross.patch delete mode 100644 packages/dbus/dbus-1.1.4/dbus-1.init delete mode 100644 packages/dbus/dbus-1.1.4/fix-install-daemon.patch delete mode 100644 packages/dbus/dbus-1.1.4/tmpdir.patch create mode 100644 packages/dbus/dbus-native_1.1.20.bb delete mode 100644 packages/dbus/dbus-native_1.1.4.bb create mode 100644 packages/dbus/dbus_1.1.20.bb delete mode 100644 packages/dbus/dbus_1.1.4.bb (limited to 'packages') diff --git a/packages/dbus/dbus-1.1.20/.mtn2git_empty b/packages/dbus/dbus-1.1.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-1.1.20/cross.patch b/packages/dbus/dbus-1.1.20/cross.patch new file mode 100644 index 0000000000..268a3ae3de --- /dev/null +++ b/packages/dbus/dbus-1.1.20/cross.patch @@ -0,0 +1,10 @@ +--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 ++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 +@@ -719,6 +719,7 @@ + exit (0); + ]])], + [ac_cv_have_abstract_sockets=yes], ++ [ac_cv_have_abstract_sockets=no], + [ac_cv_have_abstract_sockets=no] + )]) + AC_LANG_POP(C) diff --git a/packages/dbus/dbus-1.1.20/dbus-1.init b/packages/dbus/dbus-1.1.20/dbus-1.init new file mode 100644 index 0000000000..0725083c69 --- /dev/null +++ b/packages/dbus/dbus-1.1.20/dbus-1.init @@ -0,0 +1,110 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +UUIDDIR=/var/lib/dbus +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus ]; then + . /etc/default/dbus +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $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 + + if [ ! -d $UUIDDIR ]; then + mkdir -p $UUIDDIR + chown $DAEMONUSER $UUIDDIR + chgrp $DAEMONUSER $UUIDDIR + fi + + dbus-uuidgen --ensure + + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + # TODO: --reverse when busybox supports it + run-parts --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # 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 +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch b/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch new file mode 100644 index 0000000000..20c8d1b501 --- /dev/null +++ b/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch @@ -0,0 +1,14 @@ +Index: dbus-1.1.20/tools/dbus-launch.c +=================================================================== +--- dbus-1.1.20.orig/tools/dbus-launch.c ++++ dbus-1.1.20/tools/dbus-launch.c +@@ -966,7 +966,9 @@ main (int argc, char **argv) + char write_pid_fd_as_string[MAX_FD_LEN]; + char write_address_fd_as_string[MAX_FD_LEN]; + ++#ifdef DBUS_BUILD_X11 + xdisplay = NULL; ++#endif + + if (close_stderr) + do_close_stderr (); diff --git a/packages/dbus/dbus-1.1.20/fix-install-daemon.patch b/packages/dbus/dbus-1.1.20/fix-install-daemon.patch new file mode 100644 index 0000000000..c31786357d --- /dev/null +++ b/packages/dbus/dbus-1.1.20/fix-install-daemon.patch @@ -0,0 +1,13 @@ +Index: dbus-0.94/bus/Makefile.am +=================================================================== +--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 ++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 +@@ -110,7 +110,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-1.1.20/tmpdir.patch b/packages/dbus/dbus-1.1.20/tmpdir.patch new file mode 100644 index 0000000000..838b903f0a --- /dev/null +++ b/packages/dbus/dbus-1.1.20/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/dbus/dbus-1.1.4/.mtn2git_empty b/packages/dbus/dbus-1.1.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dbus/dbus-1.1.4/cross.patch b/packages/dbus/dbus-1.1.4/cross.patch deleted file mode 100644 index 268a3ae3de..0000000000 --- a/packages/dbus/dbus-1.1.4/cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 -+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 -@@ -719,6 +719,7 @@ - exit (0); - ]])], - [ac_cv_have_abstract_sockets=yes], -+ [ac_cv_have_abstract_sockets=no], - [ac_cv_have_abstract_sockets=no] - )]) - AC_LANG_POP(C) diff --git a/packages/dbus/dbus-1.1.4/dbus-1.init b/packages/dbus/dbus-1.1.4/dbus-1.init deleted file mode 100644 index 0725083c69..0000000000 --- a/packages/dbus/dbus-1.1.4/dbus-1.init +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/sh -# -*- coding: utf-8 -*- -# Debian init.d script for D-BUS -# Copyright © 2003 Colin Walters - -set -e - -DAEMON=/usr/bin/dbus-daemon -NAME=dbus -DAEMONUSER=messagebus -PIDDIR=/var/run/dbus -PIDFILE=$PIDDIR/pid -UUIDDIR=/var/lib/dbus -DESC="system message bus" -EVENTDIR=/etc/dbus-1/event.d - -test -x $DAEMON || exit 0 - -# Source defaults file; edit that file to configure this script. -ENABLED=1 -PARAMS="" -if [ -e /etc/default/dbus ]; then - . /etc/default/dbus -fi - -test "$ENABLED" != "0" || exit 0 - -start_it_up() -{ - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $DAEMONUSER $PIDDIR - chgrp $DAEMONUSER $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 - - if [ ! -d $UUIDDIR ]; then - mkdir -p $UUIDDIR - chown $DAEMONUSER $UUIDDIR - chgrp $DAEMONUSER $UUIDDIR - fi - - dbus-uuidgen --ensure - - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS - echo "$NAME." - if [ -d $EVENTDIR ]; then - run-parts --arg=start $EVENTDIR - fi -} - -shut_it_down() -{ - if [ -d $EVENTDIR ]; then - # TODO: --reverse when busybox supports it - run-parts --arg=stop $EVENTDIR - fi - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER - # 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 -} - -reload_it() -{ - echo -n "Reloading $DESC config: " - dbus-send --print-reply --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig > /dev/null - # hopefully this is enough time for dbus to reload it's config file. - echo "done." -} - -case "$1" in - start) - start_it_up - ;; - stop) - shut_it_down - ;; - reload|force-reload) - reload_it - ;; - restart) - shut_it_down - sleep 1 - start_it_up - ;; - *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/packages/dbus/dbus-1.1.4/fix-install-daemon.patch b/packages/dbus/dbus-1.1.4/fix-install-daemon.patch deleted file mode 100644 index c31786357d..0000000000 --- a/packages/dbus/dbus-1.1.4/fix-install-daemon.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dbus-0.94/bus/Makefile.am -=================================================================== ---- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 -+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 -@@ -110,7 +110,7 @@ - $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ - chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ - fi -- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) -+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-1.1.4/tmpdir.patch b/packages/dbus/dbus-1.1.4/tmpdir.patch deleted file mode 100644 index 838b903f0a..0000000000 --- a/packages/dbus/dbus-1.1.4/tmpdir.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 -+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 -@@ -1047,15 +1048,18 @@ - AC_SUBST(ABSOLUTE_TOP_BUILDDIR) - - #### Find socket directories --if ! test -z "$TMPDIR" ; then -- DEFAULT_SOCKET_DIR=$TMPDIR --elif ! test -z "$TEMP" ; then -- DEFAULT_SOCKET_DIR=$TEMP --elif ! test -z "$TMP" ; then -- DEFAULT_SOCKET_DIR=$TMP --else -- DEFAULT_SOCKET_DIR=/tmp --fi -+#if ! test -z "$TMPDIR" ; then -+# DEFAULT_SOCKET_DIR=$TMPDIR -+#elif ! test -z "$TEMP" ; then -+# DEFAULT_SOCKET_DIR=$TEMP -+#elif ! test -z "$TMP" ; then -+# DEFAULT_SOCKET_DIR=$TMP -+#else -+# DEFAULT_SOCKET_DIR=/tmp -+#fi -+ -+# checks disabled to avoid expanding this at build time -+DEFAULT_SOCKET_DIR=/tmp - - if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/dbus/dbus-native_1.0.2.bb b/packages/dbus/dbus-native_1.0.2.bb index ebd57b2876..0149ab374f 100644 --- a/packages/dbus/dbus-native_1.0.2.bb +++ b/packages/dbus/dbus-native_1.0.2.bb @@ -1,5 +1,6 @@ require dbus.inc -DEFAULT_PREFERENCE = "1" + +DEFAULT_PREFERENCE = "-1" inherit native @@ -25,4 +26,3 @@ do_stage() { do_install() { : } - diff --git a/packages/dbus/dbus-native_1.1.20.bb b/packages/dbus/dbus-native_1.1.20.bb new file mode 100644 index 0000000000..c97a6c6420 --- /dev/null +++ b/packages/dbus/dbus-native_1.1.20.bb @@ -0,0 +1,26 @@ +require dbus.inc +inherit native + +DEPENDS = "glib-2.0-native libxml2-native expat-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" + +SRC_URI = "\ + http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://fix-dbus-launch-x11.patch;patch=1 \ + file://dbus-1.init \ +" + +do_stage() { + oe_runmake install + autotools_stage_all + + # for dbus-glib-native introspection generation + install -d ${STAGING_DATADIR}/dbus + install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf +} + +do_install() { + : +} diff --git a/packages/dbus/dbus-native_1.1.4.bb b/packages/dbus/dbus-native_1.1.4.bb deleted file mode 100644 index a006965a32..0000000000 --- a/packages/dbus/dbus-native_1.1.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -require dbus.inc -inherit native - -DEPENDS = "glib-2.0-native libxml2-native expat-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" - -SRC_URI = "\ - http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ - file://cross.patch;patch=1 \ - file://tmpdir.patch;patch=1 \ - file://dbus-1.init \ -" - -do_stage() { - oe_runmake install - autotools_stage_all - - # for dbus-glib-native introspection generation - install -d ${STAGING_DATADIR}/dbus - install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf -} - -do_install() { - : -} diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index a8fd31d8c7..bca75856df 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -4,10 +4,8 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "\ - http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \ + http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://fix-install-daemon.patch;patch=1 \ diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index e803cb7189..da0a298459 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -1,6 +1,4 @@ require dbus.inc -DEFAULT_PREFERENCE = "1" - -PR = "r9" - +PR = "r10" +DEFAULT_PREFERENCE = "-1" diff --git a/packages/dbus/dbus_1.1.20.bb b/packages/dbus/dbus_1.1.20.bb new file mode 100644 index 0000000000..247e465769 --- /dev/null +++ b/packages/dbus/dbus_1.1.20.bb @@ -0,0 +1,5 @@ +include dbus.inc + +PR = "r0" + +SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1" diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb deleted file mode 100644 index 7838e55ca1..0000000000 --- a/packages/dbus/dbus_1.1.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -include dbus.inc - -PR = "r2" -- cgit v1.2.3 From 73d42c94a42b652bec05b08d4a56a51fd0ab471e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Feb 2008 18:33:32 +0000 Subject: busybox 1.9.1 factor more common things into busybox.inc disable utilities again until we're a proper replacement for tinylogin --- packages/busybox/busybox-1.9.1/defconfig | 38 ++++----- packages/busybox/busybox.inc | 127 +++++++++++++++++++++++++++---- packages/busybox/busybox_1.9.1.bb | 90 +--------------------- 3 files changed, 131 insertions(+), 124 deletions(-) (limited to 'packages') diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.1/defconfig index 61865cb4c5..40ec933361 100644 --- a/packages/busybox/busybox-1.9.1/defconfig +++ b/packages/busybox/busybox-1.9.1/defconfig @@ -378,30 +378,30 @@ CONFIG_XARGS=y # CONFIG_FEATURE_SHADOWPASSWDS is not set # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set # CONFIG_SULOGIN is not set -CONFIG_VLOCK=y +# CONFIG_VLOCK is not set # # Linux Ext2 FS Progs diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index ab17d96db4..0fb3b5efff 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -11,19 +11,21 @@ LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script \ - file://dhcp-hostname.patch;patch=1 \ - file://hwclock.sh \ - file://ifupdown-spurious-environ.patch;patch=1 \ - file://mount.busybox \ - file://syslog \ - file://syslog.conf \ - file://udhcpscript.patch;patch=1 \ - file://umount.busybox" +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://dhcp-hostname.patch;patch=1 \ + file://hwclock.sh \ + file://ifupdown-spurious-environ.patch;patch=1 \ + file://mount.busybox \ + file://syslog \ + file://syslog.conf \ + file://udhcpscript.patch;patch=1 \ + file://umount.busybox \ +" SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" @@ -34,7 +36,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" -FILES_${PN} += " ${datadir}/udhcpc" +FILES_${PN} += "${datadir}/udhcpc" INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" @@ -47,11 +49,73 @@ INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." inherit cml1 update-rc.d -do_compile () { - unset CFLAGS +do_compile() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS base_do_compile } +do_install () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + install -d ${D}${sysconfdir}/init.d + oe_runmake "PREFIX=${D}" install + cp -pPR ${S}/_install/* ${D}/ + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + ls ${D} -R + + cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ + if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www + fi + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} +} + pkg_postinst_${PN} () { # If we are not making an image we create links for the utilities that doesn't exist # so the update-alternatives script will get the utilities it needs @@ -62,3 +126,34 @@ pkg_postinst_${PN} () { # This adds the links, remember that this has to work when building an image too, hence the $D while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links } + +pkg_prerm_${PN} () { + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + + while read link + do + case "$link" in + /*/*/*) to="../../bin/busybox";; + /bin/*) to="busybox";; + /*/*) to="../bin/busybox";; + esac + bn=`basename $link` + sh /usr/bin/update-alternatives --remove $bn $to + done Date: Wed, 27 Feb 2008 18:39:27 +0000 Subject: pyneod svn fix init script name --- packages/freesmartphone/pyneod_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_svn.bb index 026d693be2..68938ed424 100644 --- a/packages/freesmartphone/pyneod_svn.bb +++ b/packages/freesmartphone/pyneod_svn.bb @@ -4,11 +4,11 @@ SECTION = "console/network" DEPENDS = "python" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit update-rc.d -INITSCRIPT_NAME = "init.d.pyneo" +INITSCRIPT_NAME = "init.d.pyneod" INITSCRIPT_PARAMS = "defaults 40" SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" -- cgit v1.2.3