From ba616771786aeba066fef24ea9e70b564ac9362c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:40:11 +0000 Subject: [PATCH 01/10] Initialize branch F-13 for initscripts --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From d6afccd4f59be852d4f745ea0c9fc26fd6880938 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 19 Feb 2010 21:45:22 +0000 Subject: [PATCH 02/10] 9.06-1 --- .cvsignore | 2 +- initscripts-9.05-link.patch | 13 ------------- initscripts.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 initscripts-9.05-link.patch diff --git a/.cvsignore b/.cvsignore index 7618acb..c28583a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.05.tar.bz2 +initscripts-9.06.tar.bz2 diff --git a/initscripts-9.05-link.patch b/initscripts-9.05-link.patch deleted file mode 100644 index e9855d4..0000000 --- a/initscripts-9.05-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 02a024a..89baeb4 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -253,7 +253,7 @@ check_link_down () - delay=10 - [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) - while [ $timeout -le $delay ]; do -- [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" = "1" ] && return 1 -+ [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1 - usleep 500000 - timeout=$((timeout+1)) - done diff --git a/initscripts.spec b/initscripts.spec index 57de21d..bb15c0c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,14 +2,13 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.05 +Version: 9.06 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch: initscripts-9.05-link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 Requires: /sbin/sysctl, syslog @@ -37,6 +36,7 @@ Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 +Conflicts: s390utils < 2:1.8.2-11 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Obsoletes: hotplug @@ -64,7 +64,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch -p1 %build make @@ -86,8 +85,6 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ - $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ - $RPM_BUILD_ROOT/lib/udev/ccw_init %else rm -f \ $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \ @@ -214,9 +211,6 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rename_device /lib/udev/console_init /lib/udev/console_check -%ifarch s390 s390x -/lib/udev/ccw_init -%endif /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -245,6 +239,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Feb 19 2010 Bill Nottingham - 9.06-1 +- move ccw_init and ccw udev rules to s390utils (#539491) +- rc.sysinit: suppress LVM2 warnings. (#561938, ) +- fix translated checks for user input (#566579) +- refresh translations + * Mon Feb 15 2010 Bill Nottingham - 9.05-1 - network-functions: don't use ethtool for link state, assorted other cleanups - inittab: fix job paths in comments () diff --git a/sources b/sources index 4a18de3..d174f15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58ff8a7a09537155cbaf09b3a8e7b25f initscripts-9.05.tar.bz2 +0e1ee1b1b77eb77c44b382e5b3e6d98c initscripts-9.06.tar.bz2 From e582b64eaf425f810910ed6d50263446d43c2d58 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 3 Mar 2010 21:36:54 +0000 Subject: [PATCH 03/10] 9.07-1 --- .cvsignore | 2 +- initscripts.spec | 26 +++++++++++++++++--------- sources | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index c28583a..617ac87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.06.tar.bz2 +initscripts-9.07.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index bb15c0c..25e9b68 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.06 +Version: 9.07 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -10,12 +10,12 @@ Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15 -Requires: /sbin/sysctl, syslog +Requires: mingetty, /bin/awk, /bin/sed, mktemp +Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools -Requires: util-linux-ng >= 2.16, mount >= 2.11l +Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87 %if with_upstart @@ -24,10 +24,9 @@ Requires: upstart >= 0.6.0 Requires: SysVinit >= 2.85-38 %endif Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find -Requires: /etc/redhat-release, dev -Requires: ethtool >= 1.8-2, /sbin/runuser +Requires: /etc/redhat-release +Requires: /sbin/runuser Requires: udev >= 125-1 -Requires: popt >= 1.12-2 Requires: cpio Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 @@ -37,9 +36,12 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 Conflicts: s390utils < 2:1.8.2-11 +Conflicts: dmraid < 1.0.0.rc16-7 +Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Obsoletes: hotplug +Conflicts: NetworkManager < 1:0.8.0 +Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig @@ -239,6 +241,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Mar 3 2010 Bill Nottingham - 9.07-1 +- clean out some extraneous package requirements +- fix dmraid error checking now that dmraid has return codes (#568790, others) +- integrate with NetworkManager for ifup/ifdown (#523064) +- translation updates: cs, da, de, en_GB, es, fi, nl, pl, pt_BR, ru, sr + * Fri Feb 19 2010 Bill Nottingham - 9.06-1 - move ccw_init and ccw udev rules to s390utils (#539491) - rc.sysinit: suppress LVM2 warnings. (#561938, ) @@ -415,7 +423,7 @@ rm -rf $RPM_BUILD_ROOT - event.d/serial: add some docs - init.d/functions: __pids_var_run: Handle multi-line pid files correctly (#473287) - remove support for no longer existing 'brctl setgcint' command. (#360471) -- add %config back for ifcfg-lo (#472761) +- add %%config back for ifcfg-lo (#472761) - rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717) - updated translations: de, sk diff --git a/sources b/sources index d174f15..63c72fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e1ee1b1b77eb77c44b382e5b3e6d98c initscripts-9.06.tar.bz2 +cb912c5be515a10d09685f8877d2beae initscripts-9.07.tar.bz2 From 26cee8a7f58956d8ae7e84af1dea7f99a0c60610 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 8 Mar 2010 20:51:35 +0000 Subject: [PATCH 04/10] 9.08 --- .cvsignore | 2 +- initscripts.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 617ac87..41557da 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.07.tar.bz2 +initscripts-9.08.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 25e9b68..cce1be7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.07 +Version: 9.08 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Mar 8 2010 Bill Nottingham - 9.08-1 +- network-functions: redirect error messages when nmcli isn't installed (#570828, ) +- ifdown: use nmcli to get the device, if not specified +- ifdown: fix typo +- translation updates: fr + * Wed Mar 3 2010 Bill Nottingham - 9.07-1 - clean out some extraneous package requirements - fix dmraid error checking now that dmraid has return codes (#568790, others) diff --git a/sources b/sources index 63c72fc..1f4a7fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb912c5be515a10d09685f8877d2beae initscripts-9.07.tar.bz2 +0808ca2d5f0b7b883ad499cdc35a83e4 initscripts-9.08.tar.bz2 From 16c76e59fdd1042b0c94204bf1652758c75bdf22 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Apr 2010 19:53:30 +0000 Subject: [PATCH 05/10] 9.09-1 --- .cvsignore | 2 +- initscripts.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 41557da..6c0d549 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.08.tar.bz2 +initscripts-9.09.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index cce1be7..0443e9a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.08 +Version: 9.09 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -28,7 +28,7 @@ Requires: /etc/redhat-release Requires: /sbin/runuser Requires: udev >= 125-1 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3 +Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 12:4.1.0-6 Conflicts: tcsh < 6.13-5 @@ -241,6 +241,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Apr 9 2010 Bill Nottingham - 9.09-1 +- rc.sysinit: change RAID handling () +- fix german mistranslation (#575954, ) +- init.d/functions: correct fix for environment with runuser. (#203010, #564093) +- halt: fix mdmom pid handling for newer mdadm (#549726, ) +- init.d/network: only blacklist the original loopback interface. (#579816, +- translation updates: de, ja, nb, pt, sv, uk + * Mon Mar 8 2010 Bill Nottingham - 9.08-1 - network-functions: redirect error messages when nmcli isn't installed (#570828, ) - ifdown: use nmcli to get the device, if not specified diff --git a/sources b/sources index 1f4a7fe..f47cbea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0808ca2d5f0b7b883ad499cdc35a83e4 initscripts-9.08.tar.bz2 +980df0c574b6dc6367c2fecd867c055d initscripts-9.09.tar.bz2 From 2bd35625068d53fb21cb78fe276a7d5af5d41a90 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Apr 2010 18:46:46 +0000 Subject: [PATCH 06/10] 9.10-1 --- .cvsignore | 2 +- initscripts.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6c0d549..2c4e6f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.09.tar.bz2 +initscripts-9.10.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 0443e9a..ae8b43b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.09 +Version: 9.10 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Apr 28 2010 Bill Nottingham - 9.10-1 +- fstab-decode.8: fix formatting (#586476) +- prefdm: add --retain-splash for KDM as well (#585250) +- init.d/functions: handle being unable to read a specified pid file. (#584575) +- init/quit-plymouth.conf: use 'task' for stopping plymouth. () +- ifup-eth: run dhclient -6 similar to dhclient -4. (#585047) +- net.hotplug: don't run on odd interfaces. (#584530) + * Fri Apr 9 2010 Bill Nottingham - 9.09-1 - rc.sysinit: change RAID handling () - fix german mistranslation (#575954, ) diff --git a/sources b/sources index f47cbea..297ba4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -980df0c574b6dc6367c2fecd867c055d initscripts-9.09.tar.bz2 +b3f242aaf8b45d35028dc3e89af1f898 initscripts-9.10.tar.bz2 From f0e82f9ea87b91bb7d23c1572baabb031ac52c59 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 3 May 2010 19:06:56 +0000 Subject: [PATCH 07/10] 9.11-1 --- .cvsignore | 2 +- initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c4e6f4..7a413e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.10.tar.bz2 +initscripts-9.11.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index ae8b43b..9a30519 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.10 +Version: 9.11 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon May 3 2010 Bill Nottingham - 9.11-1 +- init/plymouth-shutdown.conf: add 'task' here as well + * Wed Apr 28 2010 Bill Nottingham - 9.10-1 - fstab-decode.8: fix formatting (#586476) - prefdm: add --retain-splash for KDM as well (#585250) diff --git a/sources b/sources index 297ba4a..e24acfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3f242aaf8b45d35028dc3e89af1f898 initscripts-9.10.tar.bz2 +b576406455fa87bf5d329bd161df4b09 initscripts-9.11.tar.bz2 From 9de47b898db96ddcf1ceff9c71bcbcd187370ed5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 5 May 2010 16:24:27 +0000 Subject: [PATCH 08/10] 9.13-1 --- .cvsignore | 2 +- initscripts.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a413e7..712570b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.11.tar.bz2 +initscripts-9.12.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9a30519..d7582c2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.11 +Version: 9.12 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -40,7 +40,7 @@ Conflicts: dmraid < 1.0.0.rc16-7 Conflicts: e2fsprogs < 1.15 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 -Conflicts: NetworkManager < 1:0.8.0 +Conflicts: NetworkManager < 1:0.8.0-12.git20100504 Obsoletes: hotplug <= 3:2004_09_23-10.1 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils @@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed May 5 2010 Bill Nottingham - 9.12-1 +- update for final nmcli syntax + * Mon May 3 2010 Bill Nottingham - 9.11-1 - init/plymouth-shutdown.conf: add 'task' here as well diff --git a/sources b/sources index e24acfc..d74f2c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b576406455fa87bf5d329bd161df4b09 initscripts-9.11.tar.bz2 +c73218ac6ae1e5ea3a24bd10669e8a61 initscripts-9.12.tar.bz2 From 9ae4ef3d19892317f896174690c5b42071bb8573 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Jun 2010 19:16:33 +0000 Subject: [PATCH 09/10] 9.12.1-1 --- .cvsignore | 2 +- initscripts.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 712570b..a228667 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.12.tar.bz2 +initscripts-9.12.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index d7582c2..852c799 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.12 +Version: 9.12.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -241,6 +241,18 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Jun 24 2010 Bill Nottingham - 9.12.1-1 +- ifup-eth: check for dhclient configuration in /etc/dhcp as well (#607764, #607766) +- init.d/functions: handle permission denied on reading PID file. (#595597) +- network-functions: check NM_CONTROLLED before deciding to use NM for a connection. (#599707, probably others.) +- rc.sysinit: always reboot on autorelabel. (#595823) +- network-functions: behave sanely if we're not passed a device at all. (#589521, #592108) +- sysconfig/debug: export debug variables. (#589378) +- netfs: check for NetworkManager to be connected, not just running. (#589710, #592095) +- rcS*.conf - check if /etc/inittab exists (#590703, ) +- rc.sysinit - ignore monitoring on startup. (#589037) +- translation updates: or + * Wed May 5 2010 Bill Nottingham - 9.12-1 - update for final nmcli syntax diff --git a/sources b/sources index d74f2c0..2e1c833 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c73218ac6ae1e5ea3a24bd10669e8a61 initscripts-9.12.tar.bz2 +4c3fa121ab5cb54a74197edeaa72afda initscripts-9.12.1.tar.bz2 From 098955c7b801cfb7c4fa273132ec379550462265 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:17:09 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 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 6152ae2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: initscripts -# $Id$ -NAME := initscripts -SPECFILE = $(firstword $(wildcard *.spec)) - -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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13