From 510050c11fb088c9f4c2f7e710ea620781dfc8fd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 22:52:17 +0000 Subject: [PATCH 01/14] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 655ebbb9bd45059873c43d73aa700fa1ac23e05f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Apr 2008 19:36:56 +0000 Subject: [PATCH 02/14] 8.71-1 --- .cvsignore | 2 +- initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 87e2893..4ab2c53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.70.tar.bz2 +initscripts-8.71.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 0194ccf..70a04c5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.70 +Version: 8.71 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -232,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Apr 23 2008 Bill Nottingham - 8.71-1 +- adjust to gdm using LANG instead of GDM_LANG (#372151, ) +- rework netfs' check for networking availability to properly handle both network + and NetworkManager + * Tue Apr 15 2008 Bill Nottingham - 8.70-1 - find is now in /bin. Use it. (#192991, #239914, #244941, #442178) - require event-compat-sysv for now (#442291) diff --git a/sources b/sources index bba58cb..28e1b4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3cd9677b7e1103c0217f2455b9400a2 initscripts-8.70.tar.bz2 +4d93f6d611791b23ff857e6aa7289ff6 initscripts-8.71.tar.bz2 From 76f693db90ab1f87b9f2ce53761eb2070002d74a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Apr 2008 19:56:54 +0000 Subject: [PATCH 03/14] 8.72-1 --- .cvsignore | 2 +- initscripts.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ab2c53..65549a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.71.tar.bz2 +initscripts-8.72.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 70a04c5..61d47e0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.71 +Version: 8.72 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,7 +17,7 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart, event-compat-sysv +Requires: upstart, event-compat-sysv >= 0.3.9-14 %else Requires: SysVinit >= 2.85-38 %endif @@ -60,6 +60,8 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi %if with_upstart mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab + rm -f $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S99single + rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single %else mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab %endif @@ -232,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Apr 24 2008 Bill Nottingham - 8.72-1 +- don't have a S99single when using upstart (#444001, indirectly) + * Wed Apr 23 2008 Bill Nottingham - 8.71-1 - adjust to gdm using LANG instead of GDM_LANG (#372151, ) - rework netfs' check for networking availability to properly handle both network diff --git a/sources b/sources index 28e1b4d..4f10d1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d93f6d611791b23ff857e6aa7289ff6 initscripts-8.71.tar.bz2 +edeaa62a30870f3f9dd3c6800c0ca0fd initscripts-8.72.tar.bz2 From 08bdb6a60c0e6e71491914ec67ef9c5395a1c035 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 25 Apr 2008 21:25:18 +0000 Subject: [PATCH 04/14] 8.73-1 --- .cvsignore | 2 +- initscripts.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 65549a7..44d24b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.72.tar.bz2 +initscripts-8.73.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 61d47e0..5f2f5b0 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.72 +Version: 8.73 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,7 +17,8 @@ Requires: module-init-tools Requires: util-linux >= 2.10s-11, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart -Requires: upstart, event-compat-sysv >= 0.3.9-14 +Requires: upstart +Obsoletes: event-compat-sysv %else Requires: SysVinit >= 2.85-38 %endif @@ -64,6 +65,7 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single %else mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab + rm -rf $RPM_BUILD_ROOT/etc/event.d %endif rm -f $RPM_BUILD_ROOT/etc/inittab.* @@ -172,7 +174,9 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rwtab.d /etc/statetab %dir /etc/statetab.d +%if with_upstart %config(noreplace) /etc/event.d/* +%endif /etc/udev/rules.d/* %config /etc/X11/prefdm %config(noreplace) /etc/inittab @@ -227,13 +231,18 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport /etc/NetworkManager/dispatcher.d/05-netfs -%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING +%doc sysconfig.txt sysvinitfiles ChangeLog static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Apr 25 2008 Bill Nottingham - 8.73-1 +- move event-compat-sysv events here, obsolete it +- fix ctrl-alt-del during rc.sysinit (#444050) +- fix 'telinit X' from single-user mode (#444001) + * Thu Apr 24 2008 Bill Nottingham - 8.72-1 - don't have a S99single when using upstart (#444001, indirectly) diff --git a/sources b/sources index 4f10d1d..7933647 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -edeaa62a30870f3f9dd3c6800c0ca0fd initscripts-8.72.tar.bz2 +0fd1866b3fb2cb26b42033e7bc0cf7c0 initscripts-8.73.tar.bz2 From 83bed6c84007936d93299b418757719fa5e02da7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 29 Apr 2008 15:55:38 +0000 Subject: [PATCH 05/14] 8.74-1 --- .cvsignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 44d24b2..4acac76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.73.tar.bz2 +initscripts-8.74.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 5f2f5b0..1e594e9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.73 +Version: 8.74 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Apr 29 2008 Bill Nottingham - 8.74-1 +- use full path to /sbin/ip in NetworkManagerDispatcher script (#444378) +- lang.{sh,csh}: read only user customization if LANG is already set (#372151) + * Fri Apr 25 2008 Bill Nottingham - 8.73-1 - move event-compat-sysv events here, obsolete it - fix ctrl-alt-del during rc.sysinit (#444050) diff --git a/sources b/sources index 7933647..eb38756 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fd1866b3fb2cb26b42033e7bc0cf7c0 initscripts-8.73.tar.bz2 +8379710192c2554ebf0c0c585690ef66 initscripts-8.74.tar.bz2 From 749a44c6e78070324a57a240f2a918288f08f84f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 May 2008 17:32:46 +0000 Subject: [PATCH 06/14] 8.75-1 --- .cvsignore | 2 +- initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4acac76..fc292a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.74.tar.bz2 +initscripts-8.75.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 1e594e9..a07e8fd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.74 +Version: 8.75 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri May 2 2008 Bill Nottingham - 8.75-1 +- fix tcsh syntax error (#444998) + * Tue Apr 29 2008 Bill Nottingham - 8.74-1 - use full path to /sbin/ip in NetworkManagerDispatcher script (#444378) - lang.{sh,csh}: read only user customization if LANG is already set (#372151) diff --git a/sources b/sources index eb38756..d75d009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8379710192c2554ebf0c0c585690ef66 initscripts-8.74.tar.bz2 +df064ad303f3c8120b83ef199ea9a904 initscripts-8.75.tar.bz2 From 7da9af911c1c7e5a55e443e86f842606c8a8c2fe Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 May 2008 17:58:41 +0000 Subject: [PATCH 07/14] 8.76-1 --- .cvsignore | 2 +- initscripts.spec | 5 +++-- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index fc292a8..2229de2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.75.tar.bz2 +initscripts-8.76.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index a07e8fd..9387471 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.75 +Version: 8.76 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,8 +238,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Fri May 2 2008 Bill Nottingham - 8.75-1 +* Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) +- remove debugging cruft from rcS-sulogin * Tue Apr 29 2008 Bill Nottingham - 8.74-1 - use full path to /sbin/ip in NetworkManagerDispatcher script (#444378) diff --git a/sources b/sources index d75d009..ef95491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df064ad303f3c8120b83ef199ea9a904 initscripts-8.75.tar.bz2 +5edbf7edc843d21adf36c431e6a8e35c initscripts-8.76.tar.bz2 From 6d20cb392e75ab4962cce6d81e641bd43d8e9289 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 7 May 2008 17:56:41 +0000 Subject: [PATCH 08/14] 8.76.1-1 --- .cvsignore | 2 +- initscripts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2229de2..f667256 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.76.tar.bz2 +initscripts-8.76.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 9387471..becf22b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76 +Version: 8.76.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed May 7 2008 Bill Nottingham - 8.76.1-1 +- NMDispatcher/05-netfs: fix check for default route (#445509) + * Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) - remove debugging cruft from rcS-sulogin diff --git a/sources b/sources index ef95491..f4f23b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5edbf7edc843d21adf36c431e6a8e35c initscripts-8.76.tar.bz2 +27ec5bf2886d9f558a7fcf8c727dd879 initscripts-8.76.1.tar.bz2 From 149236d7b59a5ac041fba393f481185fe2509ae9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 15 May 2008 16:21:28 +0000 Subject: [PATCH 09/14] 8.76.2-1 --- .cvsignore | 2 +- initscripts.spec | 5 +---- sources | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f667256..a71c27a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.76.1.tar.bz2 +initscripts-8.76.2.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index becf22b..9387471 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76.1 +Version: 8.76 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,9 +238,6 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Wed May 7 2008 Bill Nottingham - 8.76.1-1 -- NMDispatcher/05-netfs: fix check for default route (#445509) - * Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) - remove debugging cruft from rcS-sulogin diff --git a/sources b/sources index f4f23b8..432efab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27ec5bf2886d9f558a7fcf8c727dd879 initscripts-8.76.1.tar.bz2 +378cbe22e62ddb6e6323bf342853b628 initscripts-8.76.2.tar.bz2 From cea6dcf53fc31f9e5f67b0219692b5ffebf9bf4f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 15 May 2008 16:23:16 +0000 Subject: [PATCH 10/14] commit correct spec --- initscripts.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 9387471..4843a1f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76 +Version: 8.76.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,15 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu May 15 2008 Bill Nottingham - 8.76.2- +- Don't unmount sysfs in halt. (#446292) + +* Wed May 14 2008 Peter Jones +- init.d/functions: fix resolve_dm_raid() for older dmraid configs + +* Wed May 7 2008 Bill Nottingham - 8.76.1-1 +- NMDispatcher/05-netfs: fix check for default route (#445509) + * Fri May 2 2008 Bill Nottingham - 8.76-1 - fix tcsh syntax error (#444998) - remove debugging cruft from rcS-sulogin From 877f27961e26a466a1a31e4c12c1477eeeb08f43 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 29 Aug 2008 17:02:31 +0000 Subject: [PATCH 11/14] 8.76.3-1 --- .cvsignore | 2 +- initscripts.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a71c27a..72252a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.76.2.tar.bz2 +initscripts-8.76.3.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 4843a1f..ed157d5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76.2 +Version: 8.76.3 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,7 +238,12 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Thu May 15 2008 Bill Nottingham - 8.76.2- +* Fri Aug 29 2008 Bill Nottingham - 8.76.3-1 +- rc.sysinit: Don't use -L in find (#458652, #458504, CVE-2008-3524) +- fix clock rules to properly handle old-style RTC devices (#447019) +- rc.sysinit: ix typo, and don't restorecon on swap, etc. partitions (#448886) + +* Thu May 15 2008 Bill Nottingham - 8.76.2-1 - Don't unmount sysfs in halt. (#446292) * Wed May 14 2008 Peter Jones diff --git a/sources b/sources index 432efab..0744315 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -378cbe22e62ddb6e6323bf342853b628 initscripts-8.76.2.tar.bz2 +d52082bb73247065fb38a0fc8ab546c9 initscripts-8.76.3.tar.bz2 From b02682589d9e61e631d8489b0ce22224af1117dd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 14 Oct 2008 21:05:00 +0000 Subject: [PATCH 12/14] 8.76.4-1 --- .cvsignore | 2 +- initscripts.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 72252a4..3ceee56 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.76.3.tar.bz2 +initscripts-8.76.4.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index ed157d5..70b9c5a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.76.3 +Version: 8.76.4 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -238,6 +238,12 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Oct 14 2008 Bill Nottingham - 8.76.4-1 +- use 0.0.0.0/0, not 0/0, in calls to /sbin/ip (#460580) +- fix setting of console font/map (#458362, ) +- explicitly run mdadm on boot to catch degraded arrays. () +- check more correctly whether rhgb actually starts. (#462763) + * Fri Aug 29 2008 Bill Nottingham - 8.76.3-1 - rc.sysinit: Don't use -L in find (#458652, #458504, CVE-2008-3524) - fix clock rules to properly handle old-style RTC devices (#447019) diff --git a/sources b/sources index 0744315..e89c244 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d52082bb73247065fb38a0fc8ab546c9 initscripts-8.76.3.tar.bz2 +6b0e3f006ae54c9364c1394e32ec95af initscripts-8.76.4.tar.bz2 From 78f59e103167808d256a17a6ecdbc01792d15dde Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Oct 2009 02:54:39 +0000 Subject: [PATCH 13/14] Fix typo from bad import script. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 578df4e..6152ae2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/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 07aab6ceb690b29597ff98a2870115cf10b5e9e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:17:54 +0000 Subject: [PATCH 14/14] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9