[kernel/f15-30-going-on-40] hack 3.0-rc5 to pretend to be 2.6.40-rc5
Kyle McMartin
kyle at fedoraproject.org
Thu Jul 14 17:40:18 UTC 2011
commit ae5185a30dab8c5097d57cac0b4104b1299b9706
Author: Kyle McMartin <kyle at mcmartin.ca>
Date: Thu Jun 30 11:09:31 2011 -0400
hack 3.0-rc5 to pretend to be 2.6.40-rc5
kernel.spec | 45 +++++++++++++++++++++++----------------------
sources | 3 ++-
2 files changed, 25 insertions(+), 23 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 9202634..b6dbc80 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -57,7 +57,7 @@ Summary: The Linux kernel
# base_sublevel is the kernel version we're starting with and patching
# on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
# which yields a base_sublevel of 21.
-%define base_sublevel 0
+%define base_sublevel 39
## If this is a released kernel ##
%if 0%{?released_kernel}
@@ -75,19 +75,19 @@ Summary: The Linux kernel
%define stable_base %(echo $((%{stable_update} - 1)))
%endif
%endif
-%define rpmversion 3.%{base_sublevel}%{?stablerev}
+%define rpmversion 2.6.%{base_sublevel}%{?stablerev}
## The not-released-kernel case ##
%else
# The next upstream release sublevel (base_sublevel+1)
# % define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
-%define upstream_sublevel 0
+%define upstream_sublevel 40
# The rc snapshot level
%define rcrev 5
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
-%define rpmversion 3.%{upstream_sublevel}
+%define rpmversion 2.6.%{upstream_sublevel}
%endif
# Nb: The above rcrev and gitrev values automagically define Patch00 and Patch01 below.
@@ -186,7 +186,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
# % define kversion 3.%{base_sublevel}
-%define kversion 3.%{base_sublevel}-rc%rcrev
+%define kversion 2.6.%{base_sublevel}
%define make_target bzImage
@@ -433,7 +433,7 @@ Summary: The Linux kernel
# First the general kernel 2.6 required versions as per
# Documentation/Changes
#
-%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, module-init-tools < 3.13-1, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5
+%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, module-init-tools < 3.13-1
#
# Then a series of requirements that are distribution specific, either
@@ -530,8 +530,8 @@ BuildRequires: rpm-build >= 4.4.2.1-4
%define debuginfo_args --strict-build-id
%endif
-# Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc5.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
+#Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc5.tar.bz2
Source11: genkey
Source14: find-provides
@@ -583,10 +583,9 @@ Patch01: %{stable_patch_01}
# near the top of this spec file.
%else
%if 0%{?rcrev}
-### HAX we're using -rc$x tarballs to make transitioning easier
-# Patch00: patch-3.%{upstream_sublevel}-rc%{rcrev}.bz2
+Patch00: patch-3.0-rc%{rcrev}.bz2
%if 0%{?gitrev}
-Patch01: patch-3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
+Patch01: patch-3.0-rc%{rcrev}-git%{gitrev}.bz2
%endif
%else
# pre-{base_sublevel+1}-rc1 case
@@ -960,20 +959,20 @@ ApplyOptionalPatch()
# Update to latest upstream.
%if 0%{?released_kernel}
-%define vanillaversion 3.%{base_sublevel}
+%define vanillaversion 2.6.%{base_sublevel}
# non-released_kernel case
%else
%if 0%{?rcrev}
-%define vanillaversion 3.%{upstream_sublevel}-rc%{rcrev}
+%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}
%if 0%{?gitrev}
-%define vanillaversion 3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}
+%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}
%endif
%else
# pre-{base_sublevel+1}-rc1 case
%if 0%{?gitrev}
-%define vanillaversion 3.%{base_sublevel}-git%{gitrev}
+%define vanillaversion 2.6.%{base_sublevel}-git%{gitrev}
%else
-%define vanillaversion 3.%{base_sublevel}
+%define vanillaversion 2.6.%{base_sublevel}
%endif
%endif
%endif
@@ -1040,14 +1039,14 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then
# Update vanilla to the latest upstream.
# (non-released_kernel case only)
%if 0%{?rcrev}
- # ApplyPatch patch-3.%{upstream_sublevel}-rc%{rcrev}.bz2
+ ApplyPatch patch-3.0-rc%{rcrev}.bz2
%if 0%{?gitrev}
- ApplyPatch patch-3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
+ ApplyPatch patch-3.0-rc%{rcrev}-git%{gitrev}.bz2
%endif
%else
# pre-{base_sublevel+1}-rc1 case
%if 0%{?gitrev}
- ApplyPatch patch-3.%{base_sublevel}-git%{gitrev}.bz2
+ ApplyPatch patch-3.0-git%{gitrev}.bz2
%endif
%endif
@@ -1371,7 +1370,9 @@ BuildKernel() {
# make sure EXTRAVERSION says what we want it to say
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
- perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = /' Makefile
+ perl -p -i -e 's/^VERSION.*/VERSION = 2/' Makefile
+ perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = 6/' Makefile
+ perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = 40/' Makefile
# if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
### XXX this will probably be dead code in 3.0 --kyle
@@ -1878,8 +1879,8 @@ fi
# and build.
%changelog
-* Mon Jun 27 2011 Kyle McMartin <kmcmartin at redhat.com> 3.0-0.rc5.git0.1
-- Linux 3.0-rc5
+* Thu Jun 30 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.40-0.rc5.git0.1
+- More than meets the eye, it's Linux 3.0-rc5 in disguise.
* Mon Jun 27 2011 Dave Jones <davej at redhat.com>
- Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)
diff --git a/sources b/sources
index c6f5315..441ddfa 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-02c37ab34ca73f3ff8f6c4963f0e7f1f linux-3.0-rc5.tar.bz2
+1aab7a741abe08d42e8eccf20de61e05 linux-2.6.39.tar.bz2
+1572e4d01ee7642100b082b6a9184643 patch-3.0-rc5.bz2
More information about the scm-commits
mailing list