rpms/kernel/F-10 kernel.spec,1.1310,1.1311
Chuck Ebbert
cebbert at fedoraproject.org
Mon Mar 30 23:31:46 UTC 2009
- Previous message (by thread): rpms/xfdesktop/F-9 xfdesktop-4.4.2-desktop-menu-fixes.patch, NONE, 1.1 xfdesktop-4.4.2-desktop-menu-icon.patch, NONE, 1.1 xfdesktop-4.4.2-xdg-userdir-compat.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfdesktop.spec, 1.22, 1.23 xfdesktop-4.4.2-gcc43.patch, 1.1, NONE xfdesktop-4.4.2-memleak.patch, 1.1, NONE xfdesktop-image-4.2.1.patch, 1.1, NONE xfdesktop-image.patch, 1.2, NONE
- Next message (by thread): [pkgdb] lv2core had acl change status
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20850
Modified Files:
kernel.spec
Log Message:
Make the .shared-srctree file a list so more than two checkouts
can share source files.
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1310
retrieving revision 1.1311
diff -u -r1.1310 -r1.1311
--- kernel.spec 28 Mar 2009 01:38:24 -0000 1.1310
+++ kernel.spec 30 Mar 2009 23:31:15 -0000 1.1311
@@ -923,10 +923,10 @@
%endif
%endif
-# We can share hardlinked source trees by putting the
-# directory name of the CVS checkout that we want to share
-# with in .shared-srctree. (Full pathname is required.)
-[ -f .shared-srctree ] && sharedir=$(cat .shared-srctree)
+# We can share hardlinked source trees by putting a list of
+# directory names of the CVS checkouts that we want to share
+# with in .shared-srctree. (Full pathnames are required.)
+[ -f .shared-srctree ] && sharedirs=$(cat .shared-srctree)
if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then
@@ -943,6 +943,11 @@
# Ok, first time we do a make prep.
rm -f pax_global_header
+ for sharedir in $sharedirs ; do
+ if [[ ! -z $sharedir && -d $sharedir/kernel-%{kversion}/vanilla-%{kversion} ]] ; then
+ break
+ fi
+ done
if [[ ! -z $sharedir && -d $sharedir/kernel-%{kversion}/vanilla-%{kversion} ]] ; then
%setup -q -n kernel-%{kversion} -c -T
cp -rl $sharedir/kernel-%{kversion}/vanilla-%{kversion} .
@@ -955,6 +960,11 @@
%if "%{kversion}" != "%{vanillaversion}"
+ for sharedir in $sharedirs ; do
+ if [[ ! -z $sharedir && -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then
+ break
+ fi
+ done
if [[ ! -z $sharedir && -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then
cp -rl $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} .
@@ -1810,6 +1820,10 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-11
+- Make the .shared-srctree file a list so more than two checkouts
+ can share source files.
+
* Fri Mar 27 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-10
- Change kjournald to real-time priority to avoid stalls in ext3.
- Previous message (by thread): rpms/xfdesktop/F-9 xfdesktop-4.4.2-desktop-menu-fixes.patch, NONE, 1.1 xfdesktop-4.4.2-desktop-menu-icon.patch, NONE, 1.1 xfdesktop-4.4.2-xdg-userdir-compat.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfdesktop.spec, 1.22, 1.23 xfdesktop-4.4.2-gcc43.patch, 1.1, NONE xfdesktop-4.4.2-memleak.patch, 1.1, NONE xfdesktop-image-4.2.1.patch, 1.1, NONE xfdesktop-image.patch, 1.2, NONE
- Next message (by thread): [pkgdb] lv2core had acl change status
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list