rpms/kernel/devel .cvsignore, 1.1022, 1.1023 kernel.spec, 1.1342, 1.1343

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv360

Modified Files:
	.cvsignore kernel.spec 
Log Message:
Add support for sharing source trees between CVS checkouts.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -r1.1022 -r1.1023
--- .cvsignore	26 Feb 2009 16:59:27 -0000	1.1022
+++ .cvsignore	26 Feb 2009 23:50:03 -0000	1.1023
@@ -1,4 +1,5 @@
 clog
+.shared-srctree
 GNUmakefile
 kernel-2.6.*.config
 temp-*


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1342
retrieving revision 1.1343
diff -u -r1.1342 -r1.1343
--- kernel.spec	26 Feb 2009 22:45:48 -0000	1.1342
+++ kernel.spec	26 Feb 2009 23:50:03 -0000	1.1343
@@ -903,6 +903,11 @@
 %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)
+
 if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then
 
   if [ -d kernel-%{kversion}/vanilla-%{kversion} ]; then
@@ -918,31 +923,46 @@
 
     # Ok, first time we do a make prep.
     rm -f pax_global_header
+    if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{kversion} ]] ; then
+%setup -q -n kernel-%{kversion} -c -T
+      cp -rl $sharedir/kernel-%{kversion}/vanilla-%{kversion} .
+    else
 %setup -q -n kernel-%{kversion} -c
-    mv linux-%{kversion} vanilla-%{kversion}
+      mv linux-%{kversion} vanilla-%{kversion}
+    fi
 
   fi
 
 %if "%{kversion}" != "%{vanillaversion}"
-  cp -rl vanilla-%{kversion} vanilla-%{vanillaversion}
-%endif
-  cd vanilla-%{vanillaversion}
+
+  if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then
+
+    cp -rl $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} .
+
+  else
+
+    cp -rl vanilla-%{kversion} vanilla-%{vanillaversion}
+    cd vanilla-%{vanillaversion}
 
 # Update vanilla to the latest upstream.
 # (non-released_kernel case only)
 %if 0%{?rcrev}
-ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
+    ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
 %if 0%{?gitrev}
-ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
+    ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
 %endif
 %else
 # pre-{base_sublevel+1}-rc1 case
 %if 0%{?gitrev}
-ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
+    ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 %endif
 %endif
 
-  cd ..
+    cd ..
+
+  fi
+
+%endif
 
 else
   # We already have a vanilla dir.
@@ -1765,6 +1785,9 @@
 # and build.
 
 %changelog
+* Thu Feb 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.163.rc6.git3
+- Add support for sharing source trees between CVS checkouts.
+
 * Thu Feb 26 2009 Dave Jones <davej at redhat.com> 2.6.29-0.162.rc6.git3
 - Own the /usr/src/kernels dir in devel packages.