rpms/kernel/devel kernel-2.6.spec,1.3040.2.1,1.3040.2.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 3 21:40:28 UTC 2007


Author: jwilson

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6684

Modified Files:
      Tag: private-jw-vanilla-branch
	kernel-2.6.spec 
Log Message:
More vanilla build tweaks


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3040.2.1
retrieving revision 1.3040.2.2
diff -u -r1.3040.2.1 -r1.3040.2.2
--- kernel-2.6.spec	3 Apr 2007 15:58:33 -0000	1.3040.2.1
+++ kernel-2.6.spec	3 Apr 2007 21:40:21 -0000	1.3040.2.2
@@ -50,7 +50,7 @@
 %define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
-# (well, almost none, we need a few for build purposes). Default to 0 (off).
+# (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
 
 # Versions of various parts
@@ -66,13 +66,21 @@
 %define rpmversion 2.6.%{sublevel}
 %define specrelease %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid}
 %define release %{specrelease}
-# Set upstream kernel sublevel, -rcX and -gitY levels here
-# For rawhide, usually the forthcoming kernel's sublevel, for a stable
-# release, likely something like 20.5 for kernel 2.6.20.5
+# Set upstream kernel sublevel, -rcX and -gitY and stable release levels here
+# For rawhide, uksublevel is usually the in-development kernel's sublevel and
+# stabletag is always 0.
+# For a stable release, uksublevel should match sublevel above, and stabletag
+# is the y in 2.6.x.y, or 0 in the case there is no y release yet.
 # Comment out rcrev and gitrev as needed
 %define uksublevel 21
+%if %{sublevel} == %{uksublevel}
+%define stabletag 4
+%else
 %define rcrev 5
 %define gitrev 9
+# Do not change, should always be 0 for non-stable kernel release builds
+%define stabletag 0
+%endif
 
 %define make_target bzImage
 %define kernel_image x86
@@ -84,6 +92,7 @@
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 %define hdrarch %_target_cpu
+%define pkgname kernel
 
 # if requested, only build base kernel
 %if %{with_baseonly}
@@ -105,17 +114,17 @@
 
 # if vanilla build...
 %if %{with_vanilla}
-%{?rcrev: %define rctag _rc%rcrev}
-%{?gitrev: %define gittag _git%gitrev}
-%define ukver 2.6.%{uksublevel}%{?rctag}%{?gittag}
+%{?rcrev: %define rctag .rc%rcrev}
+%{?gitrev: %define gittag .git%gitrev}
+%define ukver 2.6.%{uksublevel}
 %define includexen 0
 %define with_xen 0
 %define with_modsign 0
 # Ignore unknown options in our config-* files.
 # Some options go with patches we're not applying.
 %define oldconfig_target loose_nonint_oldconfig
-# Put upstream kernel version in release
-%define release 0.%{specrelease}.%{ukver}
+# Put upstream rc and git tags in release, if relevant
+%define release %{stabletag}%{?rctag}%{?gittag}.1%{?dist}%{?buildid}
 %else
 %define oldconfig_target nonint_oldconfig
 %endif
@@ -314,11 +323,16 @@
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.4-1
 
+%if !%{with_vanilla}
 Name: kernel
-Group: System Environment/Kernel
-License: GPLv2
 Version: %{rpmversion}
+%else
+Name: kernel-vanilla
+Version: %{ukver}
+%endif
 Release: %{release}
+Group: System Environment/Kernel
+License: GPLv2
 %if 0%{?olpc}
 ExclusiveArch: i386 i586
 %else
@@ -806,6 +820,9 @@
 Group: Development/System
 Obsoletes: glibc-kernheaders
 Provides: glibc-kernheaders = 3.0-46
+%if %{with_vanilla}
+Provides: kernel-headers = %{version}-%{release}
+%endif
 %description headers
 Kernel-headers includes the C header files that specify the interface
 between the Linux kernel and userspace libraries and programs.  The
@@ -970,7 +987,7 @@
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
   rm -f pax_global_header
-%setup -q -n %{name}-%{kversion} -c
+%setup -q -n %{pkgname}-%{kversion} -c
   mv linux-%{kversion} vanilla
 else
   # We already have a vanilla dir.
@@ -1363,7 +1380,7 @@
 
 # unpack sparse.
 if [ ! -d sparse-%{sparsever} ] ; then
-%setup -D -T -q -n %{name}-%{kversion} -a3
+%setup -D -T -q -n %{pkgname}-%{kversion} -a3
 fi
 
 # Unpack the Xen tarball.
@@ -1372,7 +1389,7 @@
 if [ -d xen ]; then
   rm -rf xen
 fi
-%setup -D -T -q -n %{name}-%{kversion} -a1
+%setup -D -T -q -n %{pkgname}-%{kversion} -a1
 cd xen
 # Any necessary hypervisor patches go here
 %patch20000 -p1
@@ -1421,7 +1438,7 @@
       DevelLink=
     fi
 
-    KernelVer=%{kversion}-%{release}$Flavour
+    KernelVer=%{version}-%{release}$Flavour
     echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
     # make sure EXTRAVERSION says what we want it to say
@@ -1687,10 +1704,10 @@
 %global __debug_package 1
 %files debuginfo-common
 %defattr(-,root,root)
-/usr/src/debug/%{name}-%{kversion}/linux-%{kversion}.%{_target_cpu}
+/usr/src/debug/%{pkgname}-%{kversion}/linux-%{kversion}.%{_target_cpu}
 %if %{includexen}
 %if %{with_xen}
-/usr/src/debug/%{name}-%{kversion}/xen
+/usr/src/debug/%{pkgname}-%{kversion}/xen
 %endif
 %endif
 %dir /usr/src/debug




More information about the fedora-cvs-commits mailing list