diff options
Diffstat (limited to 'packages')
38 files changed, 270 insertions, 246 deletions
diff --git a/packages/bluez-libs/bluez-libs_2.14.bb b/packages/bluez-libs/bluez-libs_2.14.bb deleted file mode 100644 index 5814294897..0000000000 --- a/packages/bluez-libs/bluez-libs_2.14.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez-libs/bluez-libs_2.15.bb b/packages/bluez-libs/bluez-libs_2.15.bb deleted file mode 100644 index 5814294897..0000000000 --- a/packages/bluez-libs/bluez-libs_2.15.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez-libs/bluez-libs_2.17.bb b/packages/bluez-libs/bluez-libs_2.18.bb index 7a5df4ebe4..d740bd80a9 100644 --- a/packages/bluez-libs/bluez-libs_2.17.bb +++ b/packages/bluez-libs/bluez-libs_2.18.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." SECTION = "libs" PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" PR = "r0" @@ -8,7 +9,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" inherit autotools pkgconfig -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hci_uart.h hci_vhci.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" do_stage() { oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} diff --git a/packages/bluez-utils/bluez-utils-common_2.17.inc b/packages/bluez-utils/bluez-utils-common_2.18.inc index 348636b926..82ac9e8c39 100644 --- a/packages/bluez-utils/bluez-utils-common_2.17.inc +++ b/packages/bluez-utils/bluez-utils-common_2.18.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "bluez-libs-${PV} pcmcia-cs" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ diff --git a/packages/bluez-utils/bluez-utils-dbus/dbus.patch b/packages/bluez-utils/bluez-utils-dbus/dbus.patch index ecab56b7b4..f5d670c13f 100644 --- a/packages/bluez-utils/bluez-utils-dbus/dbus.patch +++ b/packages/bluez-utils/bluez-utils-dbus/dbus.patch @@ -1,6 +1,6 @@ ---- bluez-utils-2.10/acinclude.m4.old 2004-10-19 22:34:47.000000000 +0100 -+++ bluez-utils-2.10/acinclude.m4 2004-10-19 22:50:47.000000000 +0100 -@@ -124,45 +124,14 @@ +--- bluez-utils-2.18/acinclude.m4.old 2005-07-11 12:15:00.000000000 +0200 ++++ bluez-utils-2.18/acinclude.m4 2005-07-11 12:18:48.000000000 +0200 +@@ -211,48 +211,17 @@ ]) AC_DEFUN([AC_PATH_DBUS], [ @@ -23,7 +23,7 @@ - test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include" - test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include" - fi -- + + if pkg-config --exists dbus-1; then + dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" + DBUS_LIBS="`pkg-config --libs dbus-1`" @@ -37,13 +37,16 @@ - test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64" - test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib" - fi -- + LDFLAGS="$LDFLAGS $DBUS_LIBS" - AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no) +- AC_CHECK_LIB(dbus-1, dbus_pending_call_steal_reply, AC_DEFINE(HAVE_DBUS_PENDING_CALL_STEAL_REPLY, 1, [Define to 1 if you have the dbus_pending_call_steal_reply() function.])) +- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_GET_BASIC, 1, [Define to 1 if you have the dbus_message_iter_get_basic() function.])) +- AC_CHECK_LIB(dbus-1, dbus_message_append_args, AC_DEFINE(HAVE_DBUS_MESSAGE_APPEND_ARGS, 1, [Define to 1 if you have the dbus_message_append_args() function.])) - - CPPFLAGS=$ac_save_CPPFLAGS - LDFLAGS=$ac_save_LDFLAGS -- + AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) + fi diff --git a/packages/bluez-utils/bluez-utils-dbus_2.17.bb b/packages/bluez-utils/bluez-utils-dbus_2.18.bb index f405cd5133..f405cd5133 100644 --- a/packages/bluez-utils/bluez-utils-dbus_2.17.bb +++ b/packages/bluez-utils/bluez-utils-dbus_2.18.bb diff --git a/packages/bluez-utils/bluez-utils-nodbus_2.17.bb b/packages/bluez-utils/bluez-utils-nodbus_2.18.bb index 6334a4a499..6334a4a499 100644 --- a/packages/bluez-utils/bluez-utils-nodbus_2.17.bb +++ b/packages/bluez-utils/bluez-utils-nodbus_2.18.bb diff --git a/packages/busybox/busybox-1.00/defconfig b/packages/busybox/busybox-1.00/defconfig index 164ecec914..8b8212c54a 100644 --- a/packages/busybox/busybox-1.00/defconfig +++ b/packages/busybox/busybox-1.00/defconfig @@ -467,7 +467,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y # # Common options for mount/umount # -# CONFIG_FEATURE_MOUNT_LOOP is not set +CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_FEATURE_MTAB_SUPPORT is not set # diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index baeb1117df..1a5b392b7d 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r26" +PR = "r27" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ diff --git a/packages/libpcap/libpcap-0.8.1/.mtn2git_empty b/packages/dropbear/dropbear-0.46/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libpcap/libpcap-0.8.1/.mtn2git_empty +++ b/packages/dropbear/dropbear-0.46/.mtn2git_empty diff --git a/packages/dropbear/dropbear-0.46/allow-nopw.patch b/packages/dropbear/dropbear-0.46/allow-nopw.patch new file mode 100644 index 0000000000..1a709b8da0 --- /dev/null +++ b/packages/dropbear/dropbear-0.46/allow-nopw.patch @@ -0,0 +1,37 @@ +diff -Nurd dropbear-0.45/svr-auth.c dropbear-0.45.patched/svr-auth.c +--- dropbear-0.45/svr-auth.c 2005-03-06 20:27:02.000000000 -0800 ++++ dropbear-0.45.patched/svr-auth.c 2005-03-08 15:22:43.998592744 -0800 +@@ -237,6 +237,7 @@ + } + + /* check for an empty password */ ++#ifdef DISALLOW_EMPTY_PW + if (ses.authstate.pw->pw_passwd[0] == '\0') { + TRACE(("leave checkusername: empty pword")) + dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", +@@ -244,7 +245,7 @@ + send_msg_userauth_failure(0, 1); + return DROPBEAR_FAILURE; + } +- ++#endif + TRACE(("shell is %s", ses.authstate.pw->pw_shell)) + + /* check that the shell is set */ +diff -Nurd dropbear-0.45/svr-authpasswd.c dropbear-0.45.patched/svr-authpasswd.c +--- dropbear-0.45/svr-authpasswd.c 2005-03-06 20:27:02.000000000 -0800 ++++ dropbear-0.45.patched/svr-authpasswd.c 2005-03-08 15:22:44.010591023 -0800 +@@ -64,9 +64,13 @@ + * since the shadow password may differ to that tested + * in auth.c */ + if (passwdcrypt[0] == '\0') { ++#ifdef DISALLOW_EMPTY_PASSWD + dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected", + ses.authstate.printableuser); + send_msg_userauth_failure(0, 1); ++#else ++ send_msg_userauth_success(); ++#endif + return; + } + diff --git a/packages/dropbear/dropbear-0.46/configure.patch b/packages/dropbear/dropbear-0.46/configure.patch new file mode 100644 index 0000000000..9ae84b2604 --- /dev/null +++ b/packages/dropbear/dropbear-0.46/configure.patch @@ -0,0 +1,27 @@ +diff -Nurd dropbear-0.45/configure.in dropbear-0.45.patched/configure.in +--- dropbear-0.45/configure.in 2005-03-06 20:27:02.000000000 -0800 ++++ dropbear-0.45.patched/configure.in 2005-03-08 15:22:44.040586721 -0800 +@@ -161,15 +161,20 @@ + AC_MSG_RESULT(Not using openpty) + else + AC_MSG_RESULT(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + fi + ], + [ + AC_MSG_RESULT(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + ] + ) +- ++ ++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then ++ AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) ++ no_ptc_check=yes ++ no_ptmx_check=yes ++fi + + AC_ARG_ENABLE(syslog, + [ --disable-syslog Don't include syslog support], diff --git a/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch b/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch new file mode 100644 index 0000000000..ba2b19d44a --- /dev/null +++ b/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch @@ -0,0 +1,11 @@ +diff -Nurd dropbear-0.45/kex.h dropbear-0.45.patched/kex.h +--- dropbear-0.45/kex.h 2005-03-06 20:27:02.000000000 -0800 ++++ dropbear-0.45.patched/kex.h 2005-03-08 15:22:44.064583279 -0800 +@@ -64,6 +64,6 @@ + + }; + +-#define MAX_KEXHASHBUF 2000 ++#define MAX_KEXHASHBUF 3000 + + #endif /* _KEX_H_ */ diff --git a/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch b/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch new file mode 100644 index 0000000000..e2b1dd5da5 --- /dev/null +++ b/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch @@ -0,0 +1,21 @@ +diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h +--- dropbear-0.45/options.h 2005-03-06 20:27:02.000000000 -0800 ++++ dropbear-0.45.patched/options.h 2005-03-08 15:25:09.368742090 -0800 +@@ -143,7 +143,7 @@ + * however significantly reduce the security of your ssh connections + * if the PRNG state becomes guessable - make sure you know what you are + * doing if you change this. */ +-#define DROPBEAR_RANDOM_DEV "/dev/random" ++#define DROPBEAR_RANDOM_DEV "/dev/urandom" + + /* prngd must be manually set up to produce output */ + /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/ +@@ -167,7 +167,7 @@ + /* The command to invoke for xauth when using X11 forwarding. + * "-q" for quiet */ + #ifndef XAUTH_COMMAND +-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" ++#define XAUTH_COMMAND "xauth -q" + #endif + + /* if you want to enable running an sftp server (such as the one included with diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb new file mode 100644 index 0000000000..3a2b54072f --- /dev/null +++ b/packages/dropbear/dropbear_0.46.bb @@ -0,0 +1,67 @@ +DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation" +HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" +SECTION = "console/network" +LICENSE = "MIT" +DEPENDS = "zlib" +PR = "r1" +PROVIDES = "ssh sshd" + +SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ + file://urandom-xauth-changes-to-options.h.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://allow-nopw.patch \ + file://fix-2kb-keys.patch;patch=1 \ + file://init" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "dropbear" +INITSCRIPT_PARAMS = "defaults 10" + +CFLAGS_prepend = "-I. " +LD = "${CC}" + +SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" +BINCOMMANDS = "dbclient ssh scp" +EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' + +do_configure_prepend() { + if [ "${DISTRO_TYPE}" == "debug" ]; then + patch -p1 < ${WORKDIR}/allow-nopw.patch + fi +} + +do_install() { + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/dropbear \ + ${D}${bindir} \ + ${D}${sbindir} \ + ${D}${localstatedir} + + install -m 0755 dropbearmulti ${D}${sbindir}/ + for i in ${BINCOMMANDS} + do + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i + done + for i in ${SBINCOMMANDS} + do + ln -s ./dropbearmulti ${D}${sbindir}/$i + done + cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \ + -e 's,/usr/sbin,${sbindir},g' \ + -e 's,/var,${localstatedir},g' \ + -e 's,/usr/bin,${bindir},g' \ + -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear + chmod 755 ${D}${sysconfdir}/init.d/dropbear +} + +pkg_postrm_append () { + if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_rsa_host_key + fi + if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then + rm ${sysconfdir}/dropbear/dropbear_dss_host_key + fi +} diff --git a/packages/initscripts/initscripts-1.0/akita/devices b/packages/initscripts/initscripts-1.0/akita/devices index b3a3323b8a..083090ecb9 100755 --- a/packages/initscripts/initscripts-1.0/akita/devices +++ b/packages/initscripts/initscripts-1.0/akita/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/beagle/devices b/packages/initscripts/initscripts-1.0/beagle/devices index f80b7f9edb..04fffbac10 100755 --- a/packages/initscripts/initscripts-1.0/beagle/devices +++ b/packages/initscripts/initscripts-1.0/beagle/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/c7x0/devices b/packages/initscripts/initscripts-1.0/c7x0/devices index b3a3323b8a..083090ecb9 100755 --- a/packages/initscripts/initscripts-1.0/c7x0/devices +++ b/packages/initscripts/initscripts-1.0/c7x0/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/collie/devices b/packages/initscripts/initscripts-1.0/collie/devices index 7413e455b0..9d1624428a 100755 --- a/packages/initscripts/initscripts-1.0/collie/devices +++ b/packages/initscripts/initscripts-1.0/collie/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/h3600/devices b/packages/initscripts/initscripts-1.0/h3600/devices index d7b346a655..0e59229225 100755 --- a/packages/initscripts/initscripts-1.0/h3600/devices +++ b/packages/initscripts/initscripts-1.0/h3600/devices @@ -3,6 +3,11 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + test -n "$VERBOSE" && echo -n "Setting up device links for devfs: " ( ln -s /dev/vc/0 /dev/tty0 diff --git a/packages/initscripts/initscripts-1.0/h3900/devices b/packages/initscripts/initscripts-1.0/h3900/devices index d7b346a655..0e59229225 100755 --- a/packages/initscripts/initscripts-1.0/h3900/devices +++ b/packages/initscripts/initscripts-1.0/h3900/devices @@ -3,6 +3,11 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + test -n "$VERBOSE" && echo -n "Setting up device links for devfs: " ( ln -s /dev/vc/0 /dev/tty0 diff --git a/packages/initscripts/initscripts-1.0/jornada56x/devices b/packages/initscripts/initscripts-1.0/jornada56x/devices index d7b346a655..0e59229225 100755 --- a/packages/initscripts/initscripts-1.0/jornada56x/devices +++ b/packages/initscripts/initscripts-1.0/jornada56x/devices @@ -3,6 +3,11 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + test -n "$VERBOSE" && echo -n "Setting up device links for devfs: " ( ln -s /dev/vc/0 /dev/tty0 diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices index d7b346a655..0e59229225 100755 --- a/packages/initscripts/initscripts-1.0/jornada7xx/devices +++ b/packages/initscripts/initscripts-1.0/jornada7xx/devices @@ -3,6 +3,11 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + test -n "$VERBOSE" && echo -n "Setting up device links for devfs: " ( ln -s /dev/vc/0 /dev/tty0 diff --git a/packages/initscripts/initscripts-1.0/poodle/devices b/packages/initscripts/initscripts-1.0/poodle/devices index 7413e455b0..9d1624428a 100755 --- a/packages/initscripts/initscripts-1.0/poodle/devices +++ b/packages/initscripts/initscripts-1.0/poodle/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/simpad/devices b/packages/initscripts/initscripts-1.0/simpad/devices index d7b346a655..0e59229225 100644 --- a/packages/initscripts/initscripts-1.0/simpad/devices +++ b/packages/initscripts/initscripts-1.0/simpad/devices @@ -3,6 +3,11 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + test -n "$VERBOSE" && echo -n "Setting up device links for devfs: " ( ln -s /dev/vc/0 /dev/tty0 diff --git a/packages/initscripts/initscripts-1.0/spitz/devices b/packages/initscripts/initscripts-1.0/spitz/devices index b3a3323b8a..083090ecb9 100755 --- a/packages/initscripts/initscripts-1.0/spitz/devices +++ b/packages/initscripts/initscripts-1.0/spitz/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/tosa/devices b/packages/initscripts/initscripts-1.0/tosa/devices index 5ae15589b8..61cfd9d7b9 100755 --- a/packages/initscripts/initscripts-1.0/tosa/devices +++ b/packages/initscripts/initscripts-1.0/tosa/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts-1.0/uml/devices b/packages/initscripts/initscripts-1.0/uml/devices index fc1d96788b..d6459c1633 100755 --- a/packages/initscripts/initscripts-1.0/uml/devices +++ b/packages/initscripts/initscripts-1.0/uml/devices @@ -5,6 +5,11 @@ . /etc/default/rcS +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + if test -e /dev/.devfsd then if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 058dc3d2d8..8c735b7a5e 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r46" +PR = "r47" SRC_URI = "file://halt \ file://ramdisk \ @@ -30,8 +30,8 @@ SRC_URI = "file://halt \ file://umountnfs.sh \ file://sysfs.sh \ file://device_table.txt \ - file://corgikeymap-2.6.map \ - file://tosakeymap-2.6.map" + file://corgikeymap-2.6.map \ + file://tosakeymap-2.6.map" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" diff --git a/packages/libpcap/libpcap-0.8.1/configure.patch b/packages/libpcap/libpcap-0.8.1/configure.patch deleted file mode 100644 index e3d9ea34f0..0000000000 --- a/packages/libpcap/libpcap-0.8.1/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.8.1/configure.in~configure -+++ libpcap-0.8.1/configure.in -@@ -32,13 +32,11 @@ - AC_CHECK_FUNCS(ether_hostton strerror strlcpy) - - needsnprintf=no --LIBOBJS= - AC_CHECK_FUNCS(vsnprintf snprintf,, - [needsnprintf=yes]) - if test $needsnprintf = yes; then -- LIBOBJS="$LIBOBJS snprintf.o" -+ AC_LIBOBJ([snprintf]) - fi --AC_SUBST(LIBOBJS) - - dnl to pacify those who hate protochain insn - AC_MSG_CHECKING(if --disable-protochain option is specified) diff --git a/packages/libpcap/libpcap-0.8.1/shared.patch b/packages/libpcap/libpcap-0.8.1/shared.patch deleted file mode 100644 index ef9a291734..0000000000 --- a/packages/libpcap/libpcap-0.8.1/shared.patch +++ /dev/null @@ -1,118 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.8.1/Makefile.in~shared 2003-12-15 02:42:23.000000000 +0100 -+++ libpcap-0.8.1/Makefile.in 2004-01-02 14:46:18.000000000 +0100 -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME, if not matching -+MAJ=0.8 -+MIN=1 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -49,6 +58,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -69,6 +79,9 @@ - .c.o: - @rm -f $@ - $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap-@V_PCAP@.c - FSRC = fad-@V_FINDALLDEVS@.c -@@ -83,6 +96,7 @@ - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot - # hack the extra indirection - OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -94,15 +108,22 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) $(LIBS) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ -@rm -f $@ -+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - scanner.c: $(srcdir)/scanner.l - @rm -f $@ - $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ -@@ -110,6 +131,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c -+ - pcap.o: version.h - - tokdefs.h: grammar.c -@@ -123,9 +147,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammer_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ -+ - snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c - -@@ -151,10 +182,16 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ -+ - install: - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ -+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/packages/libpcap/libpcap_0.8.1.bb b/packages/libpcap/libpcap_0.8.1.bb deleted file mode 100644 index 42dea21182..0000000000 --- a/packages/libpcap/libpcap_0.8.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Network Packet Capture Library" -SECTION = "libs" -PRIORITY = "required" - -SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; \ - file://shared.patch;patch=1 \ - file://configure.patch;patch=1" - -inherit autotools -LICENSE = "BSD" -EXTRA_OECONF = "--with-pcap=linux" -CPPFLAGS_prepend = "-I${S} " -CFLAGS_prepend = "-I${S} " -CXXFLAGS_prepend = "-I${S} " - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cat aclocal.m4 > acinclude.m4 - fi -} - -do_stage () { - install -d ${STAGING_INCDIR}/net -# install -m 0644 net/bpf.h ${STAGING_INCDIR}/net/bpf.h - install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h - install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h - install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h - oe_libinstall -a -so libpcap ${STAGING_LIBDIR} -} diff --git a/packages/libpcap/libpcap_0.8.3.bb b/packages/libpcap/libpcap_0.8.3.bb index 43ff0f3fce..bdf68e8d3f 100644 --- a/packages/libpcap/libpcap_0.8.3.bb +++ b/packages/libpcap/libpcap_0.8.3.bb @@ -2,11 +2,10 @@ DESCRIPTION = "Network Packet Capture Library" HOMEPAGE = "http://www.tcpdump.org/" LICENSE = "BSD" SECTION = "libs" -PRIORITY = "required" +PR = "r1" SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; \ file://shared.patch;patch=1" -# file://configure.patch;patch=1" inherit autotools @@ -26,5 +25,6 @@ do_stage () { install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h oe_libinstall -a -so libpcap ${STAGING_LIBDIR} - ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h + install -d ${STAGING_INCDIR}/net + ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h } diff --git a/packages/linux-hotplug/files/mmc.agent b/packages/linux-hotplug/files/mmc.agent index 3b2050d7eb..a80daa4603 100755 --- a/packages/linux-hotplug/files/mmc.agent +++ b/packages/linux-hotplug/files/mmc.agent @@ -30,7 +30,7 @@ case `uname -r` in esac if [ "$ACTION" = "add" ] ; then - sleep 1 + sleep 4 echo -n add > /dev/console for n in 1 2 3 4 ; do device=/dev/$devpath$n diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb index 26b204e21a..db4cf3f408 100644 --- a/packages/linux-hotplug/linux-hotplug_20040920.bb +++ b/packages/linux-hotplug/linux-hotplug_20040920.bb @@ -7,26 +7,26 @@ RPROVIDES = "hotplug" RCONFLICTS = "hotplug" RREPLACES = "hotplug" SECTION = "base" -PR = "r4" RSUGGESTS = "pciutils usbutils" +PR = "r6" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ - file://userspecified_hcd.patch;patch=1 \ - file://hotplug-net-agent-usb.patch;patch=1 \ - file://usbrc-busybox.patch;patch=1 \ - file://fix-net.agent \ - file://update-usb.usermap \ - file://logcheck-ignore \ - file://sleeve.agent \ - file://sleeve.rc \ - file://mmc.agent \ - file://usbd.agent \ - file://usbd \ - file://sysconfig-hotplug \ - file://sysconfig-usb \ - file://isapnp-exit.diff;patch=1 \ - file://usb-storage \ - file://soc.agent" + file://userspecified_hcd.patch;patch=1 \ + file://hotplug-net-agent-usb.patch;patch=1 \ + file://usbrc-busybox.patch;patch=1 \ + file://fix-net.agent \ + file://update-usb.usermap \ + file://logcheck-ignore \ + file://sleeve.agent \ + file://sleeve.rc \ + file://mmc.agent \ + file://usbd.agent \ + file://usbd \ + file://sysconfig-hotplug \ + file://sysconfig-usb \ + file://isapnp-exit.diff;patch=1 \ + file://usb-storage \ + file://soc.agent" S = "${WORKDIR}/hotplug-2004_09_20" @@ -54,7 +54,7 @@ do_install () { #install -d ${D}${sysconfdir}/default oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \ etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \ - mandir=${D}${oldmandir} install + mandir=${D}${oldmandir} INSTALL=install install sh ${WORKDIR}/fix-net.agent ${D} || : install -m 0755 ${WORKDIR}/update-usb.usermap ${D}${oldsbindir}/ install -m 0644 ${WORKDIR}/logcheck-ignore ${D}${sysconfdir}/logcheck/ignore.d/hotplug diff --git a/packages/python/python-pylinda_0.4.bb b/packages/python/python-pylinda_0.5.bb index 788db867c4..788db867c4 100644 --- a/packages/python/python-pylinda_0.4.bb +++ b/packages/python/python-pylinda_0.5.bb diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index d393226790..b5d277916d 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -5,6 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "PSF" RDEPENDS = "python-core python-xml python-netclient" SRCNAME = "pyxml" +PV = "0.8.3" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" diff --git a/packages/zroadmap/zroadmap_1.0.8.bb b/packages/zroadmap/zroadmap_1.0.8.bb index d5dc8a3328..9c041b2f2d 100644 --- a/packages/zroadmap/zroadmap_1.0.8.bb +++ b/packages/zroadmap/zroadmap_1.0.8.bb @@ -10,7 +10,7 @@ AUTHOR = "Pascal Martin <pascal.martin@iname.com>" HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://roadmap.digitalomaha.net/roadmap/roadmap_1_0_8_src.tar.gz \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ @@ -21,7 +21,7 @@ S = "${WORKDIR}/roadmap-${PV}/src/qt" inherit palmtop EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ - GUILDFLAGS="-lz -lpng -ljpeg -lts -lqte -lqpe -L${STAGING_LIBDIR} -L${QTDIR}/lib"' + GUILDFLAGS="-lz -lpng -ljpeg -lts -lqte -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' PARALLEL_MAKE = "" do_configure() { |