From e6783dc4bae7177bc609cf1e0123ba6044852add Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sun, 1 Feb 2009 21:01:47 +0200 Subject: [PATCH] udev: Updated (118 -> 124) --- filesystem/udev/modprobe_rules.patch | 28 +++++++++++----------- filesystem/udev/no_libvolume_id.patch | 13 +++++++---- filesystem/udev/no_libvolume_id_so.diff | 31 ++++++++++++------------- filesystem/udev/no_restart.patch | 10 ++++---- filesystem/udev/scsi_id.config.patch | 26 ++++++++++++--------- filesystem/udev/udev.desc | 6 ++--- 6 files changed, 60 insertions(+), 54 deletions(-) diff --git a/filesystem/udev/modprobe_rules.patch b/filesystem/udev/modprobe_rules.patch index 663c837e6..582905ed3 100644 --- a/filesystem/udev/modprobe_rules.patch +++ b/filesystem/udev/modprobe_rules.patch @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: package/.../udev/modprobe_rules.patch -# Copyright (C) 2007 The OpenSDE Project -# +# Copyright (C) 2007 - 2009 The OpenSDE 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 @@ -14,17 +14,17 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./etc/udev/rules.d/80-drivers.rules.orig 2007-10-10 11:26:01.000000000 -0400 -+++ ./etc/udev/rules.d/80-drivers.rules 2007-10-10 11:26:47.000000000 -0400 -@@ -8,6 +8,11 @@ - SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms" +--- ./etc/udev/rules.d/80-drivers.rules.orig 2008-06-12 08:24:30.000000000 +0300 ++++ ./etc/udev/rules.d/80-drivers.rules 2009-02-01 17:13:46.000000000 +0200 +@@ -10,6 +10,11 @@ SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block" + SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block" SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi" +SUBSYSTEM=="scsi", ATTRS{type}=="0", RUN+="/sbin/modprobe sd_mod" -+SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod" -+SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst" -+SUBSYSTEM=="scsi_device", ATTRS{type}=="1", RUN+="/sbin/modprobe st" -+SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", RUN+="/sbin/modprobe sr_mod" - SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" ++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod" ++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst" ++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ATTRS{type}=="1", RUN+="/sbin/modprobe st" ++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ATTRS{type}=="[45]", RUN+="/sbin/modprobe sr_mod" + SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" + SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe ppdev" - LABEL="drivers_end" diff --git a/filesystem/udev/no_libvolume_id.patch b/filesystem/udev/no_libvolume_id.patch index c749aa224..b418f1393 100644 --- a/filesystem/udev/no_libvolume_id.patch +++ b/filesystem/udev/no_libvolume_id.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../udev/no_libvolume_id.patch -# Copyright (C) 2006 - 2008 The OpenSDE Project +# Copyright (C) 2006 - 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,13 +14,16 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./extras/volume_id/Makefile.orig 2006-11-25 15:43:05.000000000 -0300 -+++ ./extras/volume_id/Makefile 2006-11-25 15:44:03.000000000 -0300 -@@ -56,7 +56,6 @@ +--- ./extras/volume_id/Makefile.orig 2008-06-12 08:24:30.000000000 +0300 ++++ ./extras/volume_id/Makefile 2009-02-01 17:23:26.000000000 +0200 +@@ -61,8 +61,8 @@ install-bin: all - $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) + $(INSTALL) -d $(DESTDIR)$(libudevdir) +- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) - $(MAKE) -C lib install ++ echo $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) ++ echo $(MAKE) -C lib install .PHONY: install-bin uninstall-bin: diff --git a/filesystem/udev/no_libvolume_id_so.diff b/filesystem/udev/no_libvolume_id_so.diff index 9b58b9b66..a3245d246 100644 --- a/filesystem/udev/no_libvolume_id_so.diff +++ b/filesystem/udev/no_libvolume_id_so.diff @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: package/.../udev/no_libvolume_id_so.diff -# Copyright (C) 2008 The OpenSDE Project -# +# Copyright (C) 2008 - 2009 The OpenSDE 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 @@ -14,9 +14,9 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- udev-118/extras/volume_id/lib/Makefile.orig 2008-01-13 00:57:18.000000000 +0200 -+++ udev-118/extras/volume_id/lib/Makefile 2008-01-13 00:59:17.000000000 +0200 -@@ -59,7 +59,7 @@ +--- ./extras/volume_id/lib/Makefile.orig 2008-06-12 08:24:30.000000000 +0300 ++++ ./extras/volume_id/lib/Makefile 2009-02-01 20:48:11.000000000 +0200 +@@ -60,7 +60,7 @@ libvolume_id.h \ util.h @@ -25,19 +25,18 @@ .PHONY: all .DEFAULT: all -@@ -102,14 +102,8 @@ - - install: all - $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h -- $(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB) - mkdir -p $(DESTDIR)$(usrlibdir)/ +@@ -107,14 +107,7 @@ + $(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_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc + $(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig + $(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc .PHONY: install - diff --git a/filesystem/udev/no_restart.patch b/filesystem/udev/no_restart.patch index 9a7a024a5..eea025edd 100644 --- a/filesystem/udev/no_restart.patch +++ b/filesystem/udev/no_restart.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../udev/no_restart.patch -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,15 +14,15 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./Makefile.orig 2006-11-25 16:04:08.000000000 -0300 -+++ ./Makefile 2006-11-25 16:03:29.000000000 -0300 -@@ -285,11 +285,6 @@ +--- ./Makefile.orig 2008-06-12 08:24:30.000000000 +0300 ++++ ./Makefile 2009-02-01 20:40:48.000000000 +0200 +@@ -264,11 +264,6 @@ @extras="$(EXTRAS)"; for target in $$extras; do \ $(MAKE) -C $$target $@ || exit 1; \ done; -ifndef DESTDIR - - killall udevd -- - rm -rf /dev/.udev +- - rm -rf $(udevdir)/.udev - - $(sbindir)/udevd --daemon -endif .PHONY: install-bin diff --git a/filesystem/udev/scsi_id.config.patch b/filesystem/udev/scsi_id.config.patch index 6ab7897f3..ffaf50887 100644 --- a/filesystem/udev/scsi_id.config.patch +++ b/filesystem/udev/scsi_id.config.patch @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# +# # Filename: package/.../udev/scsi_id.config.patch -# Copyright (C) 2007 The OpenSDE Project -# +# Copyright (C) 2007 - 2009 The OpenSDE 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 @@ -16,8 +16,8 @@ install scsi_id.config in etc/udev instead of etc/ - mnemoc ---- ./extras/scsi_id/Makefile.orig 2007-06-07 10:56:52.000000000 -0400 -+++ ./extras/scsi_id/Makefile 2007-06-07 10:57:54.000000000 -0400 +--- ./extras/scsi_id/Makefile.orig 2008-06-12 08:24:30.000000000 +0300 ++++ ./extras/scsi_id/Makefile 2009-02-01 20:44:37.000000000 +0200 @@ -44,7 +44,7 @@ $(E) " GENHDR " $@ $(Q) echo "/* Generated by make. */" > $@ @@ -27,16 +27,20 @@ install scsi_id.config in etc/udev instead of etc/ - mnemoc # man pages %.8: %.xml -@@ -74,9 +74,9 @@ +@@ -76,11 +76,11 @@ .PHONY: uninstall-man install-config: - @ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \ -- echo $(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir); \ -- $(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \ +- echo $(INSTALL) -d $(DESTDIR)$(etcdir); \ +- echo $(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(etcdir); \ +- $(INSTALL) -d $(DESTDIR)$(etcdir); \ +- $(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \ + @ if [ ! -r $(DESTDIR)$(configdir)/scsi_id.config ]; then \ -+ echo $(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(configdir); \ -+ $(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(configdir)/scsi_id.config; \ ++ echo $(INSTALL) -d $(DESTDIR)$(configdir)\ ++ echo $(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(configdir); \ ++ $(INSTALL) -d $(DESTDIR)$(configdir); \ ++ $(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(configdir)/scsi_id.config; \ fi .PHONY: install-config diff --git a/filesystem/udev/udev.desc b/filesystem/udev/udev.desc index 365ab94d8..f461eb2f0 100644 --- a/filesystem/udev/udev.desc +++ b/filesystem/udev/udev.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../udev/udev.desc -[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -31,8 +31,8 @@ [L] GPL [S] Stable -[V] 118 +[V] 124 [P] X -?---5---9 102.030 -[D] 3168492797 udev-118.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ +[D] 939912868 udev-124.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/