diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-08 10:17:46 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-08 10:17:46 -0400 |
| commit | 740de53011db4b7a9537412f1c3c91e14af79721 (patch) | |
| tree | f0f51c5f72ef96cd702de4584d8df685e7bdb56c /kernel.spec | |
| parent | 84f976bc2833ee82b200b7ad1e16faa5b693233c (diff) | |
| download | kernel-740de53011db4b7a9537412f1c3c91e14af79721.tar.gz kernel-740de53011db4b7a9537412f1c3c91e14af79721.tar.xz kernel-740de53011db4b7a9537412f1c3c91e14af79721.zip | |
Linux-3.1-rc1
Adjust Makefile munging for 3.x numbering scheme
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 0baa551b2..e8a0ee287 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,7 +68,7 @@ Summary: The Linux kernel %define stable_rc 0 # Set rpm version accordingly %if 0%{?stable_update} -%define stablerev .%{stable_update} +%define stablerev %{stable_update} %define stable_base %{stable_update} %if 0%{?stable_rc} # stable RCs are incremental patches, so we need the previous stable patch @@ -82,9 +82,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 0 +%define rcrev 1 # The git snapshot level -%define gitrev 21 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -529,6 +529,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4 %endif Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.bz2 +# Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.1-rc1.tar.bz2 Source11: genkey Source14: find-provides @@ -1375,8 +1376,13 @@ BuildKernel() { KernelVer=%{version}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}} echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}... + %if 0%{?stable_update} + # make sure SUBLEVEL is incremented on a stable release. Sigh 3.x. + perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{?stablerev}/" Makefile + %endif + # 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/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme %if !0%{?rcrev} @@ -1891,6 +1897,10 @@ fi # ||----w | # || || %changelog +* Mon Aug 08 2011 Josh Boyer <jwboyer@redhat.com> +- Linux-3.1-rc1 +- Adjust Makefile munging for new 3.x numbering scheme + * Fri Aug 05 2011 Dave Jones <davej@redhat.com> - Deselect CONFIG_DECNET. Unmaintained, and rubbish. |