rpms/kernel/devel kernel.spec,1.241,1.242

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23423

Modified Files:
	kernel.spec 
Log Message:
vanilla/ is now based on the latest -rc/-git
This speeds up subsequent make prep quite a bit when you have huge -rc's.




Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- kernel.spec	15 Nov 2007 17:55:05 -0000	1.241
+++ kernel.spec	15 Nov 2007 19:28:23 -0000	1.242
@@ -823,6 +823,21 @@
 %endif
 %endif
 
+patch_command='patch -p1 -F1 -s'
+ApplyPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1;
+  fi
+  case "$patch" in
+  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;;
+  esac
+}
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -831,6 +846,36 @@
   rm -f pax_global_header
 %setup -q -n kernel-%{kversion} -c
   mv linux-%{kversion} vanilla
+  cd vanilla
+
+# Update vanilla to the latest upstream.
+%if %{using_upstream_branch}
+### BRANCH APPLY ###
+%else
+
+# Update to latest upstream.
+# released_kernel with stable_update available case
+%if 0%{?stable_update}
+ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2
+
+# non-released_kernel case
+%else
+%if 0%{?rcrev}
+ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
+%if 0%{?gitrev}
+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
+%endif
+%endif
+%endif
+
+%endif
+ cd ..
+
 else
   # We already have a vanilla dir.
   cd kernel-%{kversion}
@@ -871,46 +916,6 @@
   done
 %endif
 
-patch_command='patch -p1 -F1 -s'
-ApplyPatch()
-{
-  local patch=$1
-  shift
-  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
-    exit 1;
-  fi
-  case "$patch" in
-  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
-  *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
-  *) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;;
-  esac
-}
-
-%if %{using_upstream_branch}
-### BRANCH APPLY ###
-%else
-
-# Update to latest upstream.
-# released_kernel with stable_update available case
-%if 0%{?stable_update}
-ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2
-
-# non-released_kernel case
-%else
-%if 0%{?rcrev}
-ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
-%if 0%{?gitrev}
-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
-%endif
-%endif
-%endif
-
-%endif
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1665,6 +1670,9 @@
 
 %changelog
 * Thu Nov 15 2007 Dave Jones <davej at redhat.com>
+- Change 'make prep' so that vanilla/ is always the latest upstream.
+
+* Thu Nov 15 2007 Dave Jones <davej at redhat.com>
 - 2.6.24-rc2-git5
 
 * Wed Nov 14 2007 Dave Jones <davej at redhat.com>