rpms/kernel/devel kernel.spec,1.1488,1.1489
Chuck Ebbert
cebbert at fedoraproject.org
Mon Mar 30 23:23:50 UTC 2009
- Previous message (by thread): rpms/xfdesktop/F-10 xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch, 1.1, NONE xfdesktop-4.4.2-fix-size-warning-amd64.patch, 1.1, NONE xfdesktop-4.4.2-gcc43.patch, 1.1, NONE xfdesktop-4.4.2-memleak.patch, 1.1, NONE xfdesktop-4.4.2-simplify-free-code.patch, 1.1, NONE xfdesktop-image-4.2.1.patch, 1.1, NONE xfdesktop-image.patch, 1.2, NONE
- Next 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19109
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/devel/kernel.spec,v
retrieving revision 1.1488
retrieving revision 1.1489
diff -u -r1.1488 -r1.1489
--- kernel.spec 30 Mar 2009 22:16:11 -0000 1.1488
+++ kernel.spec 30 Mar 2009 23:23:19 -0000 1.1489
@@ -938,10 +938,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
@@ -958,6 +958,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} .
@@ -970,6 +975,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} .
@@ -1859,6 +1869,10 @@
%changelog
* Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com>
+- Make the .shared-srctree file a list so more than two checkouts
+ can share source files.
+
+* Mon Mar 30 2009 Chuck Ebbert <cebbert at redhat.com>
- Separate PAT fixes that are headed for -stable from our out-of-tree ones.
* Mon Mar 30 2009 Dave Jones <davej at redhat.com>
- Previous message (by thread): rpms/xfdesktop/F-10 xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch, 1.1, NONE xfdesktop-4.4.2-fix-size-warning-amd64.patch, 1.1, NONE xfdesktop-4.4.2-gcc43.patch, 1.1, NONE xfdesktop-4.4.2-memleak.patch, 1.1, NONE xfdesktop-4.4.2-simplify-free-code.patch, 1.1, NONE xfdesktop-image-4.2.1.patch, 1.1, NONE xfdesktop-image.patch, 1.2, NONE
- Next 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list