From 1afc099f0a78eeffb26bc71c197562ef2160825e Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Sat, 7 Nov 2009 08:55:05 +0100 Subject: [PATCH] udev: Updated (118 -> 142) disabled old patches, added new ones. For some time this will be the last udev update. --- ...les.patch => modprobe_rules.patch.disable} | 27 ++++++++++--------- ...id.patch => no_libvolume_id.patch.disable} | 4 +-- ...restart.patch => no_restart.patch.disable} | 4 +-- ...es.patch => overwrite_rules.patch.disable} | 10 +++---- ...fig.patch => scsi_id.config.patch.disable} | 10 +++---- filesystem/udev/udev.conf | 15 +++++------ filesystem/udev/udev.desc | 9 +++---- filesystem/udev/unused.patch | 27 +++++++++++++++++++ 8 files changed, 66 insertions(+), 40 deletions(-) rename filesystem/udev/{modprobe_rules.patch => modprobe_rules.patch.disable} (59%) rename filesystem/udev/{no_libvolume_id.patch => no_libvolume_id.patch.disable} (89%) rename filesystem/udev/{no_restart.patch => no_restart.patch.disable} (90%) rename filesystem/udev/{overwrite_rules.patch => overwrite_rules.patch.disable} (91%) rename filesystem/udev/{scsi_id.config.patch => scsi_id.config.patch.disable} (93%) create mode 100644 filesystem/udev/unused.patch diff --git a/filesystem/udev/modprobe_rules.patch b/filesystem/udev/modprobe_rules.patch.disable similarity index 59% rename from filesystem/udev/modprobe_rules.patch rename to filesystem/udev/modprobe_rules.patch.disable index 663c837e6..7839f3472 100644 --- a/filesystem/udev/modprobe_rules.patch +++ b/filesystem/udev/modprobe_rules.patch.disable @@ -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 -# +# +# Filename: package/.../udev/modprobe_rules.patch.disable +# 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,18 @@ # 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 +--- ./rules/rules.d/80-drivers.rules.orig 2009-08-06 16:08:43.000000000 +0200 ++++ ./rules/rules.d/80-drivers.rules 2009-11-04 15:18:56.000000000 +0100 @@ -8,6 +8,11 @@ - SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms" - SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block" - SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi" + SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block" + SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block" + SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block" +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" - - LABEL="drivers_end" + SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch" + SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg" + SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev" + diff --git a/filesystem/udev/no_libvolume_id.patch b/filesystem/udev/no_libvolume_id.patch.disable similarity index 89% rename from filesystem/udev/no_libvolume_id.patch rename to filesystem/udev/no_libvolume_id.patch.disable index c749aa224..ba7879a7d 100644 --- a/filesystem/udev/no_libvolume_id.patch +++ b/filesystem/udev/no_libvolume_id.patch.disable @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../udev/no_libvolume_id.patch -# Copyright (C) 2006 - 2008 The OpenSDE Project +# Filename: package/.../udev/no_libvolume_id.patch.disable +# Copyright (C) 2006 - 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # diff --git a/filesystem/udev/no_restart.patch b/filesystem/udev/no_restart.patch.disable similarity index 90% rename from filesystem/udev/no_restart.patch rename to filesystem/udev/no_restart.patch.disable index 9a7a024a5..8ed1432ba 100644 --- a/filesystem/udev/no_restart.patch +++ b/filesystem/udev/no_restart.patch.disable @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../udev/no_restart.patch -# Copyright (C) 2006 The OpenSDE Project +# Filename: package/.../udev/no_restart.patch.disable +# Copyright (C) 2006 - 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # diff --git a/filesystem/udev/overwrite_rules.patch b/filesystem/udev/overwrite_rules.patch.disable similarity index 91% rename from filesystem/udev/overwrite_rules.patch rename to filesystem/udev/overwrite_rules.patch.disable index f6caac9c7..7d40dc617 100644 --- a/filesystem/udev/overwrite_rules.patch +++ b/filesystem/udev/overwrite_rules.patch.disable @@ -1,11 +1,11 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../udev/overwrite_rules.patch -# Copyright (C) 2007 The OpenSDE Project -# +# +# Filename: package/.../udev/overwrite_rules.patch.disable +# 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 diff --git a/filesystem/udev/scsi_id.config.patch b/filesystem/udev/scsi_id.config.patch.disable similarity index 93% rename from filesystem/udev/scsi_id.config.patch rename to filesystem/udev/scsi_id.config.patch.disable index 6ab7897f3..62cea50ba 100644 --- a/filesystem/udev/scsi_id.config.patch +++ b/filesystem/udev/scsi_id.config.patch.disable @@ -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 -# +# +# Filename: package/.../udev/scsi_id.config.patch.disable +# 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 diff --git a/filesystem/udev/udev.conf b/filesystem/udev/udev.conf index 035bbc3cf..3fc464c55 100644 --- a/filesystem/udev/udev.conf +++ b/filesystem/udev/udev.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../udev/udev.conf -# Copyright (C) 2007 - 2008 The OpenSDE Project +# Copyright (C) 2007 - 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -34,11 +34,16 @@ udev_rules() { echo "Installing our .rules files..." for x in $confdir/rules/*.rules; do - [ ! -e "etc/udev/rules.d/${x##*/}" ] || echo_warning "${x##*/}: conflict detected." + [ ! -e "rules/rules.d/${x##*/}" ] || echo_warning "${x##*/}: conflict detected." install -v -m 644 $x $rulesd/ done } +if ! atstage native; then + var_append confopt " " "--disable-shared" + var_append confopt " " "--enable-static" +fi + hook_add postmake 5 'udev_devices' hook_add postmake 6 'udev_rules' @@ -46,12 +51,6 @@ var_append makeopt ' ' "LD=$CC" var_append makeopt ' ' 'DEBUG=true' -# FIXME: For now we have to build it static by default because of our initrd! -#if [ "$SDECFG_STATIC" == "1" ]; then - var_append makeopt ' ' "VOLUME_ID_STATIC=true" - var_append patchfiles ' ' "$confdir/no_libvolume_id_so.diff" -#fi - # list of extra helpers to build and install hook_add postpatch 5 "export extras=\$( ls -1d extras/* | grep -v '\.sh' | tr '\n' ' ' )" var_append makeopt ' ' 'EXTRAS="$extras"' diff --git a/filesystem/udev/udev.desc b/filesystem/udev/udev.desc index 365ab94d8..f43a1db1c 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,7 @@ [L] GPL [S] Stable -[V] 118 -[P] X -?---5---9 102.030 - -[D] 3168492797 udev-118.tar.bz2 http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ +[V] 142 +[P] X -?---5---9 111.430 +[D] 1984052876 udev-142.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/ diff --git a/filesystem/udev/unused.patch b/filesystem/udev/unused.patch new file mode 100644 index 000000000..4fccfeb7c --- /dev/null +++ b/filesystem/udev/unused.patch @@ -0,0 +1,27 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../udev/unused.patch +# Copyright (C) 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 +# 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./extras/cdrom_id/cdrom_id.c.orig 2009-04-23 15:02:36.000000000 +0200 ++++ ./extras/cdrom_id/cdrom_id.c 2009-11-05 13:22:36.000000000 +0100 +@@ -140,7 +140,7 @@ + cmd->sg_io.mx_sb_len = sizeof(cmd->_sense); + cmd->sg_io.cmdp = cmd->cgc.cmd; + cmd->sg_io.sbp = cmd->_sense.u; +- cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO; ++ cmd->sg_io.flags = SG_FLAG_UNUSED_LUN_INHIBIT | SG_FLAG_DIRECT_IO; + } + cmd->sg_io.cmd_len = i + 1; + cmd->cgc.cmd[i] = arg;