rpms/kernel/devel kernel.spec, 1.244, 1.245 linux-2.6-utrace-core.patch, 1.9, 1.10 linux-2.6-utrace-ptrace-compat.patch, 1.9, 1.10

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel.spec linux-2.6-utrace-core.patch 
	linux-2.6-utrace-ptrace-compat.patch 
Log Message:
vanilla needs to be per-release


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- kernel.spec	16 Nov 2007 17:09:37 -0000	1.244
+++ kernel.spec	16 Nov 2007 18:51:26 -0000	1.245
@@ -842,23 +842,44 @@
 # 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.
-if [ ! -d kernel-%{kversion}/vanilla ]; then
+
+%if %{using_upstream_branch}
+%else
+# Update to latest upstream.
+# released_kernel with stable_update available case
+%if 0%{?stable_update}
+%define vanillaversion 2.6.%{base_sublevel}.%{stable_update}
+# non-released_kernel case
+%else
+%if 0%{?rcrev}
+%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}
+%if 0%{?gitrev}
+%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}
+%endif
+%else
+# pre-{base_sublevel+1}-rc1 case
+%if 0%{?gitrev}
+%define vanillaversion 2.6.%{base_sublevel}-git%{gitrev}
+%endif
+%endif
+%endif
+%endif
+
+if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then
   # Ok, first time we do a make prep.
   rm -f pax_global_header
 %setup -q -n kernel-%{kversion} -c
-  mv linux-%{kversion} vanilla
-  cd vanilla
+  mv linux-%{kversion} vanilla-%{vanillaversion}
+  cd vanilla-%{vanillaversion}
 
 # 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}
@@ -889,7 +910,7 @@
   fi
 fi
 
-cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+cp -rl vanilla-%{vanillaversion} linux-%{kversion}.%{_target_cpu}
 
 cd linux-%{kversion}.%{_target_cpu}
 

linux-2.6-utrace-core.patch:

Index: linux-2.6-utrace-core.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-core.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-utrace-core.patch	12 Nov 2007 08:19:34 -0000	1.9
+++ linux-2.6-utrace-core.patch	16 Nov 2007 18:51:26 -0000	1.10
@@ -36,7 +36,7 @@
 
 --- linux-2.6/kernel/Makefile
 +++ linux-2.6/kernel/Makefile
-@@ -58,6 +58,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o
+@@ -57,6 +57,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o
  obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
  obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
  obj-$(CONFIG_MARKERS) += marker.o
@@ -3865,7 +3865,7 @@
     	u32 self_exec_id;
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -744,3 +744,21 @@ source "block/Kconfig"
+@@ -749,3 +749,21 @@ source "block/Kconfig"
  
  config PREEMPT_NOTIFIERS
  	bool

linux-2.6-utrace-ptrace-compat.patch:

Index: linux-2.6-utrace-ptrace-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace-ptrace-compat.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-utrace-ptrace-compat.patch	12 Nov 2007 08:19:34 -0000	1.9
+++ linux-2.6-utrace-ptrace-compat.patch	16 Nov 2007 18:51:26 -0000	1.10
@@ -3514,7 +3514,7 @@
  	    signal.o sys.o kmod.o workqueue.o pid.o \
  	    rcupdate.o extable.o params.o posix-timers.o \
  	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
-@@ -59,6 +59,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayac
+@@ -58,6 +58,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayac
  obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
  obj-$(CONFIG_MARKERS) += marker.o
  obj-$(CONFIG_UTRACE) += utrace.o
@@ -3783,7 +3783,7 @@
  #endif
 --- linux-2.6/init/Kconfig
 +++ linux-2.6/init/Kconfig
-@@ -747,10 +747,21 @@ config PREEMPT_NOTIFIERS
+@@ -752,10 +752,21 @@ config PREEMPT_NOTIFIERS
  
  menu "Process debugging support"