From dc75ad9de5600b3463d8da3fdf94ed85e545411f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 23:54:00 +0000 Subject: [PATCH 01/11] Initialize branch F-9 for udev --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 168aa32ae0cbb2a20db5795cd425f60087139ee7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 23 Apr 2008 15:41:04 +0000 Subject: [PATCH 02/11] - rules_generator: net rules - always add KERNEL== match to generated rules - Resolves: rhbz#440568 --- ...ator-net-rules-always-add-KERNEL-mat.patch | 49 +++++++++++++++++++ udev.spec | 26 ++++++---- 2 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch diff --git a/0006-rules_generator-net-rules-always-add-KERNEL-mat.patch b/0006-rules_generator-net-rules-always-add-KERNEL-mat.patch new file mode 100644 index 0000000..dd4f665 --- /dev/null +++ b/0006-rules_generator-net-rules-always-add-KERNEL-mat.patch @@ -0,0 +1,49 @@ +From e6d70ed63a03f39de148e6b0afb47cbbc5ec78eb Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 15 Apr 2008 00:21:51 +0200 +Subject: [PATCH] rules_generator: net rules - always add KERNEL== match to generated rules + +--- + .../75-persistent-net-generator.rules | 2 +- + extras/rule_generator/write_net_rules | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules +index 2aa3076..85a4c5b 100644 +--- a/extras/rule_generator/75-persistent-net-generator.rules ++++ b/extras/rule_generator/75-persistent-net-generator.rules +@@ -18,7 +18,7 @@ SUBSYSTEM!="net", GOTO="persistent_net_generator_end" + NAME=="?*", GOTO="persistent_net_generator_end" + + # device name whitelist +-KERNEL!="eth*|ath*|wlan*[0-9]|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end" ++KERNEL!="eth*|ath*|wlan*[0-9]|msh*|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end" + + # ignore Xen virtual interfaces + SUBSYSTEMS=="xen", GOTO="persistent_net_generator_end" +diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules +index 765e56f..322398b 100644 +--- a/extras/rule_generator/write_net_rules ++++ b/extras/rule_generator/write_net_rules +@@ -92,6 +92,9 @@ if [ -z "$match" ]; then + exit 1 + fi + ++basename=${INTERFACE%%[0-9]*} ++match="$match, KERNEL==\"$basename*\"" ++ + if [ "$INTERFACE_NAME" ]; then + # external tools may request a custom name + COMMENT="$COMMENT (custom name provided by external tool)" +@@ -101,8 +104,6 @@ if [ "$INTERFACE_NAME" ]; then + fi + else + # if a rule using the current name already exists, find a new name +- basename=${INTERFACE%%[0-9]*} +- match="$match, KERNEL==\"$basename*\"" + if interface_name_taken; then + INTERFACE="$basename$(find_next_available "$basename[0-9]*")" + echo "INTERFACE_NEW=$INTERFACE" +-- +1.5.4.5 + diff --git a/udev.spec b/udev.spec index 6bd809c..6167e5a 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 120 -Release: 3%{?dist} +Release: 4.20080421git%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -19,11 +19,12 @@ Source3: udev-post.init Source4: fw_unit_symlinks.sh Source5: udev.sysconfig -Patch1: udev-116-nettype.patch -Patch4: udev-118-sysconf.patch +Patch6: 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch -Patch100: udev-089-nopie.patch -Patch101: udev-091-lib64.patch +Patch101: udev-116-nettype.patch +Patch102: udev-118-sysconf.patch +Patch103: udev-089-nopie.patch +Patch104: udev-091-lib64.patch ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -74,11 +75,14 @@ which contains functions to get volume ids. %prep %setup -q -%patch1 -p1 -b .nettype -%patch4 -p1 -b .sysconf -%patch100 -p1 -b .nopie -%patch101 -p1 -b .lib64 +%patch6 -p1 -b .git6 + +%patch101 -p1 -b .nettype +%patch102 -p1 -b .sysconf + +%patch103 -p1 -b .nopie +%patch104 -p1 -b .lib64 %build @@ -394,6 +398,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Mon Apr 21 2008 Harald Hoyer 120-4.20080421git +- rules_generator: net rules - always add KERNEL== match to generated rules +- Resolves: rhbz#440568 + * Fri Apr 11 2008 Harald Hoyer 120-3 - fixed pre/preun scriptlets (bug #441941) - removed fedora specific patch for selinux symlink handling From 1b3402b1ebf0ceb8a28ea7d24d25f1db2fd52992 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 6 May 2008 10:30:11 +0000 Subject: [PATCH 03/11] - remove /dev/.udev in start_udev (bug #442827) --- start_udev | 1 + udev.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/start_udev b/start_udev index 1d99b3c..5a3702a 100755 --- a/start_udev +++ b/start_udev @@ -228,6 +228,7 @@ getval() { make_extra_nodes cmdline=$(cat /proc/cmdline) kill_udevd > "$udev_root/null" 2>&1 +rm -fr $udev_root/.udev > "$udev_root/null" 2>&1 UDEV_OPTS="" if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events diff --git a/udev.spec b/udev.spec index 6167e5a..42d325c 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 120 -Release: 4.20080421git%{?dist} +Release: 5.20080421git%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -398,6 +398,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Tue May 06 2008 Harald Hoyer 120-5.20080421git +- remove /dev/.udev in start_udev (bug #442827) + * Mon Apr 21 2008 Harald Hoyer 120-4.20080421git - rules_generator: net rules - always add KERNEL== match to generated rules - Resolves: rhbz#440568 From bb43f514129bb7fe3a8b67fc8506df1a8696a76f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 12 Jun 2008 11:01:06 +0000 Subject: [PATCH 04/11] - version 124 - removed udevcontrol, udevtrigger symlinks (use udevadm now) --- .cvsignore | 2 +- ...ator-net-rules-always-add-KERNEL-mat.patch | 49 ------------------- sources | 2 +- start_udev | 18 +++---- udev-089.tar.bz2.sign | 8 --- udev-116-rhrules.patch | 17 ------- udev-118-slink-selinux.patch | 12 ----- udev-118-varlib.patch | 25 ---------- udev-120-rhrules.patch | 10 ++++ udev-124.tar.bz2.sign | 8 +++ udev.spec | 37 +++++++++++--- 11 files changed, 58 insertions(+), 130 deletions(-) delete mode 100644 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch delete mode 100644 udev-089.tar.bz2.sign delete mode 100644 udev-116-rhrules.patch delete mode 100644 udev-118-slink-selinux.patch delete mode 100644 udev-118-varlib.patch create mode 100644 udev-120-rhrules.patch create mode 100644 udev-124.tar.bz2.sign diff --git a/.cvsignore b/.cvsignore index 616156a..2a71af6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -udev-120.tar.bz2 +udev-124.tar.bz2 diff --git a/0006-rules_generator-net-rules-always-add-KERNEL-mat.patch b/0006-rules_generator-net-rules-always-add-KERNEL-mat.patch deleted file mode 100644 index dd4f665..0000000 --- a/0006-rules_generator-net-rules-always-add-KERNEL-mat.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e6d70ed63a03f39de148e6b0afb47cbbc5ec78eb Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Tue, 15 Apr 2008 00:21:51 +0200 -Subject: [PATCH] rules_generator: net rules - always add KERNEL== match to generated rules - ---- - .../75-persistent-net-generator.rules | 2 +- - extras/rule_generator/write_net_rules | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules -index 2aa3076..85a4c5b 100644 ---- a/extras/rule_generator/75-persistent-net-generator.rules -+++ b/extras/rule_generator/75-persistent-net-generator.rules -@@ -18,7 +18,7 @@ SUBSYSTEM!="net", GOTO="persistent_net_generator_end" - NAME=="?*", GOTO="persistent_net_generator_end" - - # device name whitelist --KERNEL!="eth*|ath*|wlan*[0-9]|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end" -+KERNEL!="eth*|ath*|wlan*[0-9]|msh*|ra*|sta*|ctc*|lcs*|hsi*", GOTO="persistent_net_generator_end" - - # ignore Xen virtual interfaces - SUBSYSTEMS=="xen", GOTO="persistent_net_generator_end" -diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules -index 765e56f..322398b 100644 ---- a/extras/rule_generator/write_net_rules -+++ b/extras/rule_generator/write_net_rules -@@ -92,6 +92,9 @@ if [ -z "$match" ]; then - exit 1 - fi - -+basename=${INTERFACE%%[0-9]*} -+match="$match, KERNEL==\"$basename*\"" -+ - if [ "$INTERFACE_NAME" ]; then - # external tools may request a custom name - COMMENT="$COMMENT (custom name provided by external tool)" -@@ -101,8 +104,6 @@ if [ "$INTERFACE_NAME" ]; then - fi - else - # if a rule using the current name already exists, find a new name -- basename=${INTERFACE%%[0-9]*} -- match="$match, KERNEL==\"$basename*\"" - if interface_name_taken; then - INTERFACE="$basename$(find_next_available "$basename[0-9]*")" - echo "INTERFACE_NEW=$INTERFACE" --- -1.5.4.5 - diff --git a/sources b/sources index 29ee647..8492b2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71d10400458de14f6e46f52a1a591532 udev-120.tar.bz2 +4da0471c0ca3a2a2a77692f67120c03d udev-124.tar.bz2 diff --git a/start_udev b/start_udev index 5a3702a..5e35856 100755 --- a/start_udev +++ b/start_udev @@ -240,30 +240,30 @@ if [ -f "/sys/class/tty/console/uevent" ]; then udevtimeout=$(getval udevtimeout $cmdline) if strstr "$cmdline" udevdebug; then - /sbin/udevcontrol log_priority=debug + /sbin/udevadm control log_priority=debug fi if strstr "$cmdline" udevinfo; then - /sbin/udevcontrol log_priority=info + /sbin/udevadm control log_priority=info fi if strstr "$cmdline" udevtrace; then UDEV_OPTS="$UDEV_OPTS --debug-trace" fi if strstr "$cmdline" udevchilds; then - /sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline) + /sbin/udevadm control max_childs_running=$(getval udevchilds $cmdline) fi if [ "$UDEV_PERSISTENT_STORAGE" == "no" ]; then - /sbin/udevcontrol env UDEV_NO_PERSISTENT_STORAGE=1 + /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1 fi if strstr "$cmdline" udevnopersist; then - /sbin/udevcontrol env UDEV_NO_PERSISTENT_STORAGE=1 + /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1 fi - /sbin/udevcontrol env STARTUP=1 + /sbin/udevadm control env STARTUP=1 if strstr "$cmdline" modprobedebug; then - /sbin/udevcontrol env MODPROBE_OPTIONS="-s -v -q" + /sbin/udevadm control env MODPROBE_OPTIONS="-s -v -q" echo findalias /sys | while read modules ; do if [ -n "$modules" ]; then @@ -274,12 +274,12 @@ if [ -f "/sys/class/tty/console/uevent" ]; then echo "Triggering Rest" fi - /sbin/udevtrigger + /sbin/udevadm trigger ret=$[$ret + $?] wait_for_queue $udevtimeout ret=$[$ret + $?] wait - /sbin/udevcontrol env STARTUP= + /sbin/udevadm control env STARTUP= else echo -n " kernel too old for this udev version " /sbin/udevd -d $UDEV_OPTS diff --git a/udev-089.tar.bz2.sign b/udev-089.tar.bz2.sign deleted file mode 100644 index 5bd8278..0000000 --- a/udev-089.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBEMVclyGugalF9Dw4RAkuzAJ9u9BKZ86Pv/KLYSK5bJyhXACMCEACdFEjl -e0bVNMtNCImQEiK8abUsIQw= -=Gyt7 ------END PGP SIGNATURE----- diff --git a/udev-116-rhrules.patch b/udev-116-rhrules.patch deleted file mode 100644 index 0de3545..0000000 --- a/udev-116-rhrules.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up udev-118/etc/udev/redhat/40-redhat.rules.rhrules udev-118/etc/udev/redhat/40-redhat.rules ---- udev-118/etc/udev/redhat/40-redhat.rules.rhrules 2007-12-19 00:50:56.000000000 +0100 -+++ udev-118/etc/udev/redhat/40-redhat.rules 2008-02-20 12:19:07.000000000 +0100 -@@ -5,12 +5,10 @@ KERNEL=="hd*[0-9]", ATTRS{media}=="flopp - - KERNEL=="fw*", PROGRAM="fw_unit_symlinks.sh %k %n", SYMLINK+="$result" - --ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", SYMLINK+="scanner scanner-%k", MODE="0660" -+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="3|6", SYMLINK+="scanner scanner-%k", MODE="0660" - - ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk" - --ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644" -- - BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", SYMLINK+="floppy floppy-%k" - - KERNEL=="fd[0-9]*", SYMLINK+="floppy floppy-%k" diff --git a/udev-118-slink-selinux.patch b/udev-118-slink-selinux.patch deleted file mode 100644 index f70d027..0000000 --- a/udev-118-slink-selinux.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up udev-120/udev_node.c.slink udev-120/udev_node.c ---- udev-120/udev_node.c.slink 2008-04-03 21:12:53.000000000 +0200 -+++ udev-120/udev_node.c 2008-04-04 14:15:33.000000000 +0200 -@@ -146,7 +146,7 @@ static int node_symlink(const char *node - buf[len] = '\0'; - if (strcmp(target, buf) == 0) { - info("preserve already existing symlink '%s' to '%s'", slink, target); -- selinux_setfilecon(slink, NULL, S_IFLNK); -+ /*selinux_setfilecon(slink, NULL, S_IFLNK);*/ - goto exit; - } - } diff --git a/udev-118-varlib.patch b/udev-118-varlib.patch deleted file mode 100644 index a7a0baa..0000000 --- a/udev-118-varlib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up udev-118/extras/rule_generator/write_net_rules.varlib udev-118/extras/rule_generator/write_net_rules ---- udev-118/extras/rule_generator/write_net_rules.varlib 2008-03-13 14:28:23.000000000 +0100 -+++ udev-118/extras/rule_generator/write_net_rules 2008-03-13 14:32:10.000000000 +0100 -@@ -21,7 +21,7 @@ - # INTERFACE_NAME requested name supplied by external tool - # INTERFACE_NEW new interface name returned by rule writer - --RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' -+RULES_FILE='/dev/.udev/rules.d/70-persistent-net.rules' - - if [ "$MATCHIFTYPE" ]; then - [ $[MATCHIFTYPE] -gt 256 ] && return 0 -diff -up udev-118/extras/rule_generator/write_cd_rules.varlib udev-118/extras/rule_generator/write_cd_rules ---- udev-118/extras/rule_generator/write_cd_rules.varlib 2008-03-13 14:28:16.000000000 +0100 -+++ udev-118/extras/rule_generator/write_cd_rules 2008-03-13 14:32:23.000000000 +0100 -@@ -11,7 +11,7 @@ - # under the terms of the GNU General Public License as published by the - # Free Software Foundation version 2 of the License. - --RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" -+RULES_FILE="/dev/.udev/rules.d/70-persistent-cd.rules" - - . /lib/udev/rule_generator.functions - -diff -up udev-118/extras/rule_generator/rule_generator.functions.varlib udev-118/extras/rule_generator/rule_generator.functions diff --git a/udev-120-rhrules.patch b/udev-120-rhrules.patch new file mode 100644 index 0000000..dab159f --- /dev/null +++ b/udev-120-rhrules.patch @@ -0,0 +1,10 @@ +diff -up udev-121/etc/udev/redhat/40-redhat.rules.rhrules udev-121/etc/udev/redhat/40-redhat.rules +--- udev-121/etc/udev/redhat/40-redhat.rules.rhrules 2008-05-09 09:22:23.000000000 +0200 ++++ udev-121/etc/udev/redhat/40-redhat.rules 2008-05-16 11:58:39.000000000 +0200 +@@ -23,3 +23,6 @@ KERNEL=="vcs[0-9]*", OWNER="vc + KERNEL=="vcsa", OWNER="vcsa", GROUP="tty" + KERNEL=="vcsa[0-9]*", OWNER="vcsa", GROUP="tty" + KERNEL=="vcc/*", OWNER="vcsa", GROUP="tty" ++ ++KERNEL=="event*", ATTRS{idVendor}=="03f0", ATTRS{interface}=="Virtual Mouse", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="input/hp_ilo_mouse" ++ diff --git a/udev-124.tar.bz2.sign b/udev-124.tar.bz2.sign new file mode 100644 index 0000000..d78a969 --- /dev/null +++ b/udev-124.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBIULWHyGugalF9Dw4RAioFAJ0fg9gLQjpgv4Y9cxjAHaKkaF7trQCfRGyd +lJrHWGmX0sbDgB8MZs/B6B0= +=Ci89 +-----END PGP SIGNATURE----- diff --git a/udev.spec b/udev.spec index 42d325c..c33be7a 100644 --- a/udev.spec +++ b/udev.spec @@ -5,8 +5,8 @@ Summary: A userspace implementation of devfs Name: udev -Version: 120 -Release: 5.20080421git%{?dist} +Version: 124 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -19,13 +19,13 @@ Source3: udev-post.init Source4: fw_unit_symlinks.sh Source5: udev.sysconfig -Patch6: 0006-rules_generator-net-rules-always-add-KERNEL-mat.patch - Patch101: udev-116-nettype.patch Patch102: udev-118-sysconf.patch Patch103: udev-089-nopie.patch Patch104: udev-091-lib64.patch +Patch200: udev-120-rhrules.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -76,14 +76,14 @@ which contains functions to get volume ids. %prep %setup -q -%patch6 -p1 -b .git6 - %patch101 -p1 -b .nettype %patch102 -p1 -b .sysconf %patch103 -p1 -b .nopie %patch104 -p1 -b .lib64 +%patch200 -p1 -b .rhrules + %build %if %{with_static} @@ -312,9 +312,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING README TODO ChangeLog RELEASE-NOTES docs/* -%attr(0755,root,root) /sbin/udevcontrol %attr(0755,root,root) /sbin/udevadm -%attr(0755,root,root) /sbin/udevtrigger %attr(0755,root,root) /sbin/udevsettle %attr(0755,root,root) /sbin/udevd %attr(0755,root,root) /sbin/start_udev @@ -398,11 +396,34 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Thu Jun 12 2008 Harald Hoyer 124-1 +- version 124 +- removed udevcontrol, udevtrigger symlinks (use udevadm now) + +* Tue Jun 3 2008 Jeremy Katz - 121-2.20080516git +- Add lost F9 change to remove /dev/.udev in start_udev (#442827) + +* Fri May 16 2008 Harald Hoyer 121-1.20080516git +- version 121 + latest git fixes + +* Thu May 07 2008 Harald Hoyer 120-6.20080421git +- added input/hp_ilo_mouse symlink + * Tue May 06 2008 Harald Hoyer 120-5.20080421git - remove /dev/.udev in start_udev (bug #442827) * Mon Apr 21 2008 Harald Hoyer 120-4.20080421git +- added patches from git: +- persistent device naming: also read unpartitioned media +- scsi_id: initialize serial strings +- logging: add trailing newline to all strings +- path_id: remove subsystem whitelist +- allow setting of MODE="0000" +- selinux: more context settings - rules_generator: net rules - always add KERNEL== match to generated rules +- cdrom_id: replace with version which also exports media properties +- vol_id: add --offset option +- udevinfo: do not replace chars when printing ATTR== matches - Resolves: rhbz#440568 * Fri Apr 11 2008 Harald Hoyer 120-3 From 4beb6f5ba9c4cf7de75163c56559efd2ff6c4228 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 17 Jun 2008 10:37:22 +0000 Subject: [PATCH 05/11] - readded udevcontrol, udevtrigger symlinks for Fedora 9, which are needed by live-cd-tools --- udev.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index c33be7a..8a10414 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 124 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -195,6 +195,11 @@ ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevinfo ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_bindir}/udevtest ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevmonitor +%if 0%{?fedora} <= 9 +ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevtrigger +ln -sf ../../sbin/udevadm $RPM_BUILD_ROOT/sbin/udevcontrol +%endif + %if %{with_static} for i in extras/scsi_id/scsi_id \ extras/ata_id/ata_id \ @@ -314,6 +319,10 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING README TODO ChangeLog RELEASE-NOTES docs/* %attr(0755,root,root) /sbin/udevadm %attr(0755,root,root) /sbin/udevsettle +%if 0%{?fedora} <= 9 +%attr(0755,root,root) /sbin/udevtrigger +%attr(0755,root,root) /sbin/udevcontrol +%endif %attr(0755,root,root) /sbin/udevd %attr(0755,root,root) /sbin/start_udev %attr(0755,root,root) /sbin/scsi_id @@ -396,6 +405,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Tue Jun 17 2008 Harald Hoyer 124-1.1 +- readded udevcontrol, udevtrigger symlinks for Fedora 9, + which are needed by live-cd-tools + * Thu Jun 12 2008 Harald Hoyer 124-1 - version 124 - removed udevcontrol, udevtrigger symlinks (use udevadm now) From af8d162be720fafcc904c2200eaf19eef72cb058 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 4 Jul 2008 15:25:00 +0000 Subject: [PATCH 06/11] - make block devices 0660 as an interim fix (rhbz#451320) --- udev-120-rhrules.patch | 18 +++++++++++++++--- udev.spec | 5 ++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/udev-120-rhrules.patch b/udev-120-rhrules.patch index dab159f..a9cbfdc 100644 --- a/udev-120-rhrules.patch +++ b/udev-120-rhrules.patch @@ -1,6 +1,6 @@ -diff -up udev-121/etc/udev/redhat/40-redhat.rules.rhrules udev-121/etc/udev/redhat/40-redhat.rules ---- udev-121/etc/udev/redhat/40-redhat.rules.rhrules 2008-05-09 09:22:23.000000000 +0200 -+++ udev-121/etc/udev/redhat/40-redhat.rules 2008-05-16 11:58:39.000000000 +0200 +diff -up udev-124/etc/udev/redhat/40-redhat.rules.rhrules udev-124/etc/udev/redhat/40-redhat.rules +--- udev-124/etc/udev/redhat/40-redhat.rules.rhrules 2008-06-12 07:24:30.000000000 +0200 ++++ udev-124/etc/udev/redhat/40-redhat.rules 2008-07-04 17:22:31.000000000 +0200 @@ -23,3 +23,6 @@ KERNEL=="vcs[0-9]*", OWNER="vc KERNEL=="vcsa", OWNER="vcsa", GROUP="tty" KERNEL=="vcsa[0-9]*", OWNER="vcsa", GROUP="tty" @@ -8,3 +8,15 @@ diff -up udev-121/etc/udev/redhat/40-redhat.rules.rhrules udev-121/etc/udev/redh + +KERNEL=="event*", ATTRS{idVendor}=="03f0", ATTRS{interface}=="Virtual Mouse", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="input/hp_ilo_mouse" + +diff -up udev-124/etc/udev/rules.d/50-udev-default.rules.rhrules udev-124/etc/udev/rules.d/50-udev-default.rules +--- udev-124/etc/udev/rules.d/50-udev-default.rules.rhrules 2008-07-04 17:22:34.000000000 +0200 ++++ udev-124/etc/udev/rules.d/50-udev-default.rules 2008-07-04 17:22:40.000000000 +0200 +@@ -58,7 +58,7 @@ KERNEL=="lp[0-9]*", GROUP="lp", SYMLINK + KERNEL=="irlpt[0-9]*", GROUP="lp" + + # block, tapes, block-releated +-SUBSYSTEM=="block", GROUP="disk", MODE="0640" ++SUBSYSTEM=="block", GROUP="disk", MODE="0660" + SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n" + SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60" + SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900" diff --git a/udev.spec b/udev.spec index 8a10414..85cc3f1 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 124 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -405,6 +405,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Fri Jul 04 2008 Harald Hoyer 124-1.2 +- make block devices 0660 as an interim fix (rhbz#451320) + * Tue Jun 17 2008 Harald Hoyer 124-1.1 - readded udevcontrol, udevtrigger symlinks for Fedora 9, which are needed by live-cd-tools From a5ba6770876d1e0830289da7b561d9cb48480369 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 6 Aug 2008 12:18:39 +0000 Subject: [PATCH 07/11] - added patch for cdrom tray close bug (rhbz#453095) - fixed udevadm syntax in start_udev (credits B.J.W. Polman) --- start_udev | 24 ++++++++++++------------ udev-vol_id-cdrom.patch | 11 +++++++++++ udev.spec | 8 +++++++- 3 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 udev-vol_id-cdrom.patch diff --git a/start_udev b/start_udev index 5e35856..ef72536 100755 --- a/start_udev +++ b/start_udev @@ -234,36 +234,36 @@ if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - /sbin/udevd -d + if strstr "$cmdline" udevtrace; then + UDEV_OPTS="$UDEV_OPTS --debug-trace" + fi + /sbin/udevd -d $UDEV_OPTS ret=$[$ret + $?] udevtimeout=$(getval udevtimeout $cmdline) if strstr "$cmdline" udevdebug; then - /sbin/udevadm control log_priority=debug + /sbin/udevadm control --log_priority=debug fi if strstr "$cmdline" udevinfo; then - /sbin/udevadm control log_priority=info - fi - if strstr "$cmdline" udevtrace; then - UDEV_OPTS="$UDEV_OPTS --debug-trace" + /sbin/udevadm control --log_priority=info fi if strstr "$cmdline" udevchilds; then - /sbin/udevadm control max_childs_running=$(getval udevchilds $cmdline) + /sbin/udevadm control --max_childs_running=$(getval udevchilds $cmdline) fi if [ "$UDEV_PERSISTENT_STORAGE" == "no" ]; then - /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1 + /sbin/udevadm control --env=UDEV_NO_PERSISTENT_STORAGE=1 fi if strstr "$cmdline" udevnopersist; then - /sbin/udevadm control env UDEV_NO_PERSISTENT_STORAGE=1 + /sbin/udevadm control --env=UDEV_NO_PERSISTENT_STORAGE=1 fi - /sbin/udevadm control env STARTUP=1 + /sbin/udevadm control --env=STARTUP=1 if strstr "$cmdline" modprobedebug; then - /sbin/udevadm control env MODPROBE_OPTIONS="-s -v -q" + /sbin/udevadm control --env=MODPROBE_OPTIONS="-s -v -q" echo findalias /sys | while read modules ; do if [ -n "$modules" ]; then @@ -279,7 +279,7 @@ if [ -f "/sys/class/tty/console/uevent" ]; then wait_for_queue $udevtimeout ret=$[$ret + $?] wait - /sbin/udevadm control env STARTUP= + /sbin/udevadm control --env=STARTUP= else echo -n " kernel too old for this udev version " /sbin/udevd -d $UDEV_OPTS diff --git a/udev-vol_id-cdrom.patch b/udev-vol_id-cdrom.patch new file mode 100644 index 0000000..5089012 --- /dev/null +++ b/udev-vol_id-cdrom.patch @@ -0,0 +1,11 @@ +--- a/etc/udev/rules.d/60-persistent-storage.rules ++++ b/etc/udev/rules.d/60-persistent-storage.rules +@@ -52,6 +52,8 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA + + # skip unpartitioned removable media devices from drivers which do not send "change" events + ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" ++# skip optical drives without media ++ENV{DEVTYPE}=="disk", KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}!="?*", GOTO="persistent_storage_end" + + # import filesystem metadata + IMPORT{program}="vol_id --export $tempnode" diff --git a/udev.spec b/udev.spec index 85cc3f1..fa6899d 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 124 -Release: 1%{?dist}.2 +Release: 2%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -23,6 +23,7 @@ Patch101: udev-116-nettype.patch Patch102: udev-118-sysconf.patch Patch103: udev-089-nopie.patch Patch104: udev-091-lib64.patch +Patch105: udev-vol_id-cdrom.patch Patch200: udev-120-rhrules.patch @@ -81,6 +82,7 @@ which contains functions to get volume ids. %patch103 -p1 -b .nopie %patch104 -p1 -b .lib64 +%patch105 -p1 -b .tray %patch200 -p1 -b .rhrules @@ -405,6 +407,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Wed Aug 06 2008 Harald Hoyer 124-2 +- added patch for cdrom tray close bug (rhbz#453095) +- fixed udevadm syntax in start_udev (credits B.J.W. Polman) + * Fri Jul 04 2008 Harald Hoyer 124-1.2 - make block devices 0660 as an interim fix (rhbz#451320) From 36d4f78fe47855df601dbbc4da3f9ca7171bf78a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 15 Apr 2009 17:07:54 +0000 Subject: [PATCH 08/11] - fix for CVE-2009-1185 --- udev-118-sysconf.patch | 20 ++++++++++---------- udev-CVE-2009-1185.patch | 39 +++++++++++++++++++++++++++++++++++++++ udev.spec | 7 ++++++- 3 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 udev-CVE-2009-1185.patch diff --git a/udev-118-sysconf.patch b/udev-118-sysconf.patch index 272ca72..30406c2 100644 --- a/udev-118-sysconf.patch +++ b/udev-118-sysconf.patch @@ -1,18 +1,18 @@ -diff -up udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage.rules ---- udev-120/etc/udev/rules.d/60-persistent-storage.rules.sysconf 2008-04-03 21:12:53.000000000 +0200 -+++ udev-120/etc/udev/rules.d/60-persistent-storage.rules 2008-04-04 14:11:35.000000000 +0200 -@@ -3,6 +3,8 @@ - # persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path} - # scheme based on "Linux persistent device names", 2004, Hannes Reinecke +diff -up udev-124/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-124/etc/udev/rules.d/60-persistent-storage.rules +--- udev-124/etc/udev/rules.d/60-persistent-storage.rules.sysconf 2008-06-12 07:24:30.000000000 +0200 ++++ udev-124/etc/udev/rules.d/60-persistent-storage.rules 2009-04-14 15:38:25.000000000 +0200 +@@ -6,6 +6,8 @@ + # forward scsi device event to corresponding block device + ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" +ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_end" + ACTION!="add|change", GOTO="persistent_storage_end" SUBSYSTEM!="block", GOTO="persistent_storage_end" -diff -up udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules ---- udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf 2008-04-03 21:12:53.000000000 +0200 -+++ udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules 2008-04-04 14:10:46.000000000 +0200 +diff -up udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules +--- udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf 2008-06-12 07:24:30.000000000 +0200 ++++ udev-124/etc/udev/rules.d/60-persistent-storage-tape.rules 2009-04-14 15:38:25.000000000 +0200 @@ -2,6 +2,8 @@ # persistent storage links: /dev/tape/{by-id,by-path} @@ -21,4 +21,4 @@ diff -up udev-120/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev + ACTION!="add|change", GOTO="persistent_storage_tape_end" - KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" + # type 8 devices are "Medium Changers" diff --git a/udev-CVE-2009-1185.patch b/udev-CVE-2009-1185.patch new file mode 100644 index 0000000..4159637 --- /dev/null +++ b/udev-CVE-2009-1185.patch @@ -0,0 +1,39 @@ +diff -ruNp udev-124~/udevd.c udev-124/udevd.c +--- udev-124~/udevd.c 2008-06-11 22:24:30.000000000 -0700 ++++ udev-124/udevd.c 2009-04-08 16:30:06.000000000 -0700 +@@ -753,16 +753,34 @@ static struct udevd_uevent_msg *get_netl + struct udevd_uevent_msg *msg; + int bufpos; + ssize_t size; ++ struct sockaddr_nl snl; ++ struct msghdr smsg; ++ struct iovec iov; + static char buffer[UEVENT_BUFFER_SIZE+512]; + char *pos; + +- size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0); ++ iov.iov_base = buffer; ++ iov.iov_len = sizeof(buffer); ++ ++ memset(&smsg, 0x00, sizeof(struct msghdr)); ++ smsg.msg_name = &snl; ++ smsg.msg_namelen = sizeof(struct sockaddr_nl); ++ smsg.msg_iov = &iov; ++ smsg.msg_iovlen = 1; ++ ++ size = recvmsg(uevent_netlink_sock, &smsg, 0); + if (size < 0) { + if (errno != EINTR) + err("unable to receive kernel netlink message: %s\n", strerror(errno)); + return NULL; + } + ++ if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) { ++ info("ignored netlink message from invalid group/sender %d/%d\n", ++ snl.nl_groups, snl.nl_pid); ++ return NULL; ++ } ++ + if ((size_t)size > sizeof(buffer)-1) + size = sizeof(buffer)-1; + buffer[size] = '\0'; diff --git a/udev.spec b/udev.spec index fa6899d..4dd09bd 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 124 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -24,6 +24,7 @@ Patch102: udev-118-sysconf.patch Patch103: udev-089-nopie.patch Patch104: udev-091-lib64.patch Patch105: udev-vol_id-cdrom.patch +Patch106: udev-CVE-2009-1185.patch Patch200: udev-120-rhrules.patch @@ -83,6 +84,7 @@ which contains functions to get volume ids. %patch103 -p1 -b .nopie %patch104 -p1 -b .lib64 %patch105 -p1 -b .tray +%patch106 -p1 -b .CVE-2009-1185 %patch200 -p1 -b .rhrules @@ -407,6 +409,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Tue Apr 14 2009 Harald Hoyer 124-3 +- fix for CVE-2009-1185 + * Wed Aug 06 2008 Harald Hoyer 124-2 - added patch for cdrom tray close bug (rhbz#453095) - fixed udevadm syntax in start_udev (credits B.J.W. Polman) From 4358c5863113f86eb76cbc57d0c22496a7099047 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 16 Apr 2009 06:45:00 +0000 Subject: [PATCH 09/11] - fix for CVE-2009-1186 --- udev-CVE-2009-1186.patch | 12 ++++++++++++ udev.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 udev-CVE-2009-1186.patch diff --git a/udev-CVE-2009-1186.patch b/udev-CVE-2009-1186.patch new file mode 100644 index 0000000..307087f --- /dev/null +++ b/udev-CVE-2009-1186.patch @@ -0,0 +1,12 @@ +diff -up udev-124/udev_utils_string.c.CVE-2009-1186 udev-124/udev_utils_string.c +--- udev-124/udev_utils_string.c.CVE-2009-1186 2009-04-16 08:43:43.000000000 +0200 ++++ udev-124/udev_utils_string.c 2009-04-16 08:43:54.000000000 +0200 +@@ -52,7 +52,7 @@ void remove_trailing_chars(char *path, c + + size_t path_encode(char *s, size_t len) + { +- char t[(len * 3)+1]; ++ char t[(len * 4)+1]; + size_t i, j; + + t[0] = '\0'; diff --git a/udev.spec b/udev.spec index 4dd09bd..95e493a 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 124 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -25,6 +25,7 @@ Patch103: udev-089-nopie.patch Patch104: udev-091-lib64.patch Patch105: udev-vol_id-cdrom.patch Patch106: udev-CVE-2009-1185.patch +Patch107: udev-CVE-2009-1186.patch Patch200: udev-120-rhrules.patch @@ -85,6 +86,7 @@ which contains functions to get volume ids. %patch104 -p1 -b .lib64 %patch105 -p1 -b .tray %patch106 -p1 -b .CVE-2009-1185 +%patch107 -p1 -b .CVE-2009-1186 %patch200 -p1 -b .rhrules @@ -409,6 +411,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Thu Apr 16 2009 Harald Hoyer 124-4 +- fix for CVE-2009-1186 + * Tue Apr 14 2009 Harald Hoyer 124-3 - fix for CVE-2009-1185 From 7f3eafdbbf860455e83bd5c497ddcfa5e1405e09 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:35 +0000 Subject: [PATCH 10/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 79bd188..c72f44b 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ # Makefile for source rpm: udev -# $Id: Makefile,v 1.2 2004/11/04 16:16:37 harald Exp $ +# $Id: Makefile,v 1.3 2007/10/15 19:29:11 notting Exp $ NAME := udev SPECFILE = $(firstword $(wildcard *.spec)) UPSTREAM_CHECKS = sign define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6947d52d9c6f612d8165401751dee9e0defb6051 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:38:36 +0000 Subject: [PATCH 11/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 22 ---------------------- branch | 1 - 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c72f44b..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Makefile for source rpm: udev -# $Id: Makefile,v 1.3 2007/10/15 19:29:11 notting Exp $ -NAME := udev -SPECFILE = $(firstword $(wildcard *.spec)) -UPSTREAM_CHECKS = sign - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9