Am Dienstag, den 28.10.2008, 16:15 +0000 schrieb Adam Stirk: > If you send me a patch file I will happily test it on a clean build. I > have been looking at the current udev.conf I have an idea for a patch > to fix my NIC persistence problem that I could also incorporate. > > Adam >
Voila - here is the patch, would be great if you verify that it works for you as well. Updating udev (and possibly breaking initrd) is always a bit risky... Therefore I wanted to make sure the resulting initrd still boots. Michael
Index: package/base/dietlibc/patches/pkg_udev.patch =================================================================== --- package/base/dietlibc/patches/pkg_udev.patch (Revision 30901) +++ package/base/dietlibc/patches/pkg_udev.patch (Arbeitskopie) @@ -1,27 +1,6 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/patches/pkg_udev.patch -# Copyright (C) 2006 - 2008 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -We need tiny, early-userspace aware binares statically linked with dietlibc by -default. Thus no .so. - - - Rene Rebe <[EMAIL PROTECTED]> - ---- udev-083/extras/scsi_id/scsi.h.orig 2006-01-27 01:41:07.000000000 +0100 -+++ udev-083/extras/scsi_id/scsi.h 2006-02-01 16:44:28.000000000 +0100 -@@ -81,9 +81,9 @@ +--- udev-128/extras/scsi_id/scsi.h.orig 2008-08-26 09:21:40.000000000 +0200 ++++ udev-128/extras/scsi_id/scsi.h 2008-09-17 16:22:22.000000000 +0200 +@@ -70,9 +70,9 @@ #define SCSI_ID_ASCII 2 struct scsi_id_search_values { @@ -34,45 +13,16 @@ }; /* - ---- udev-101/extras/volume_id/Makefile.orig 2006-09-30 14:30:00.000000000 +0200 -+++ udev-101/extras/volume_id/Makefile 2006-10-11 20:14:42.000000000 +0200 -@@ -36,11 +36,7 @@ +--- udev-128/udev/udevd.c.orig 2008-09-10 21:37:29.000000000 +0200 ++++ udev-128/udev/udevd.c 2008-09-17 16:04:48.000000000 +0200 +@@ -47,6 +47,10 @@ + #include "udev.h" + #include "udev_rules.h" - $(PROG): %: $(HEADERS) %.o lib/libvolume_id.a - $(E) " LD " $@ --ifeq ($(strip $(VOLUME_ID_STATIC)),true) - $(Q) $(LD) $(LDFLAGS) -o $@ [EMAIL PROTECTED] $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS) --else -- $(Q) $(LD) $(LDFLAGS) -o $@ [EMAIL PROTECTED] $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS) --endif ++#ifndef SO_RCVBUFFORCE ++#define SO_RCVBUFFORCE (33) ++#endif ++ + #define UDEVD_PRIORITY -4 + #define UDEV_PRIORITY -2 - # man pages - %.8: %.xml ---- udev-119/extras/volume_id/lib/Makefile.vanilla 2008-03-23 21:32:43.000000000 +0100 -+++ udev-119/extras/volume_id/lib/Makefile 2008-03-23 21:35:26.000000000 +0100 -@@ -59,7 +59,7 @@ - libvolume_id.h \ - util.h - --all: libvolume_id.a $(SHLIB) libvolume_id.pc -+all: libvolume_id.a libvolume_id.pc - .PHONY: all - .DEFAULT: all - -@@ -106,14 +106,8 @@ - $(INSTALL) -d $(DESTDIR)$(includedir) - $(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h - $(INSTALL) -d $(DESTDIR)$(libdir) -- $(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB) - $(INSTALL) -d $(DESTDIR)$(usrlibdir) -- ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR) --ifeq ($(libdir),$(usrlibdir)) -- ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so --else -- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so --endif -+ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a - $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig - $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc - .PHONY: install Index: package/base/dietlibc/parse-config-9 =================================================================== --- package/base/dietlibc/parse-config-9 (Revision 30901) +++ package/base/dietlibc/parse-config-9 (Arbeitskopie) @@ -40,6 +41,8 @@ apply_patchfiles # TODO: re-schedule a clean rebuild + rm -f config.cache + eval_config_command $confopt $extraconfopt eval $MAKE clean eval $MAKE $makeopt eval $MAKE $makeinstopt @@ -70,6 +73,9 @@ echo_status "First pass, linking against system libc, ..." pkg_dietlibc_useit=0 hook_add postmake 7 pkg_dietlibc_rebuild + else + # force static linking + var_append extraconfopt ' ' '--enable-shared=no' fi ;; esac Index: package/filesystem/udev/udev.desc =================================================================== --- package/filesystem/udev/udev.desc (Revision 30901) +++ package/filesystem/udev/udev.desc (Arbeitskopie) @@ -30,7 +30,7 @@ [L] GPL [S] Beta -[V] 120 +[V] 130 [P] X -1---5---9 102.030 -[D] X udev-120.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ +[D] X udev-130.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ Index: package/filesystem/udev/hotfix-notglibc-__s32-undefined.patch =================================================================== --- package/filesystem/udev/hotfix-notglibc-__s32-undefined.patch (Revision 30901) +++ package/filesystem/udev/hotfix-notglibc-__s32-undefined.patch (Arbeitskopie) @@ -1,30 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../udev/hotfix-notglibc-__s32-undefined.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Build error on mips32/dietlibc: __s32 undefined -klibc != !glibc, we are using dietlibc/uclibc as well! - ---- udev-103/udev_sysdeps.h.orig 2006-10-20 14:43:35.000000000 +0200 -+++ udev-103/udev_sysdeps.h 2006-12-11 10:32:16.000000000 +0100 -@@ -104,7 +104,7 @@ - } - #else - /* needed until /usr/include/sys/inotify.h is working */ --#ifndef __GLIBC__ -+#ifdef __KLIBC__ - #include <sys/inotify.h> - #else - static inline int inotify_init(void) Index: package/filesystem/udev/no-udevd-restart.patch =================================================================== --- package/filesystem/udev/no-udevd-restart.patch (Revision 30901) +++ package/filesystem/udev/no-udevd-restart.patch (Arbeitskopie) @@ -1,41 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../udev/no-udevd-restart.patch -# Copyright (C) 2006 - 2008 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - ---- udev-120/Makefile.orig 2008-04-03 19:12:53.000000000 +0000 -+++ udev-120/Makefile 2008-04-08 21:03:20.000000000 +0000 -@@ -266,11 +266,6 @@ - @extras="$(EXTRAS)"; for target in $$extras; do \ - $(MAKE) -C $$target $@ || exit 1; \ - done; --ifndef DESTDIR -- - killall udevd -- - rm -rf /dev/.udev -- - $(sbindir)/udevd --daemon --endif - .PHONY: install-bin - - uninstall-bin: -@@ -280,10 +275,6 @@ - - rm -f $(DESTDIR)$(sbindir)/udevsettle - - rm -f $(DESTDIR)$(sbindir)/udevcontrol - - rm -f $(DESTDIR)$(usrbindir)/udevinfo --ifndef DESTDIR -- - killall udevd -- - rm -rf /dev/.udev --endif - @extras="$(EXTRAS)"; for target in $$extras; do \ - $(MAKE) -C $$target $@ || exit 1; \ - done; Index: package/filesystem/udev/udevadm-compat.patch =================================================================== --- package/filesystem/udev/udevadm-compat.patch (Revision 0) +++ package/filesystem/udev/udevadm-compat.patch (Revision 0) @@ -0,0 +1,17 @@ +--- ./udev/udevadm.c.orig 2008-09-10 01:17:59.000000000 +0200 ++++ ./udev/udevadm.c 2008-09-18 10:14:14.000000000 +0200 +@@ -165,9 +165,13 @@ + if (len > 0) { + prog[len] = '\0'; + fprintf(stderr, "the program '%s' called '%s', it should use 'udevadm %s <options>', " +- "this will stop working in a future release\n", prog, argv[0], command); ++ "this will stop working in a future release " ++ "(Note: T2-SDE generated backwards compatibility symlinks)\n", ++ prog, argv[0], command); ++#if 0 + err(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', " + "this will stop working in a future release\n", prog, argv[0], command); ++#endif + } + rc = run_command(udev, &cmds[i], argc, argv); + goto out; Index: package/filesystem/udev/udev.conf =================================================================== --- package/filesystem/udev/udev.conf (Revision 30901) +++ package/filesystem/udev/udev.conf (Arbeitskopie) @@ -33,6 +33,11 @@ cp -fv $x $root/lib/udev/$d chmod +x $root/lib/udev/$d done + + echo "Installing T2 backwards compatibility symlinks" + for OLDTOOL in udevtrigger udevsettle udevctrl udevmonitor; do + ln -sf udevadm $root$sbindir/$OLDTOOL + done } [ $SDECFG_PKG_UDEV_DEVDIR ] || SDECFG_PKG_UDEV_DEVDIR=/dev @@ -41,6 +46,7 @@ var_append makeopt " " 'EXTRAS="$uxp" prefix=' var_append makeinstopt " " "LD=$CC LDFLAGS= udevdir=$SDECFG_PKG_UDEV_DEVDIR" var_append makeinstopt " " 'EXTRAS="$uxp" prefix=' +var_append makeinstopt " " "pkgconfigdir=/usr/lib/pkgconfig" hook_add premake 5 "mkdir -p $root/lib/udev" hook_add postmake 5 "udev_pm"
----------------------------------------------------------- If you wish to unsubscribe from this mailing, send mail to [EMAIL PROTECTED] with a subject of: unsubscribe t2
