restore SUBLEVEL in version to work better with dkms, but prepare to some bugfixing elsewhere [release 3.14.24-2mamba;Thu Nov 20 2014]
This commit is contained in:
parent
83de084394
commit
6b278760cc
164
kernel.spec
164
kernel.spec
@ -21,10 +21,11 @@
|
||||
|
||||
# Don't parametrize this, it's a check to avoid build a kernel without having
|
||||
# edited the obsoletes needed for multiple kernel support
|
||||
%define KERNEL_OBSOLETES_ARE_FOR_VERSION 3.14.23
|
||||
%define KERNEL_OBSOLETES_ARE_FOR_VERSION 3.14.24
|
||||
|
||||
#% define kernel_longterm 1
|
||||
%define kernel_ver %(echo %version | cut -d. -f1-2)
|
||||
%define kernel_majver %(echo %version | cut -d. -f1-2)
|
||||
%define kernel_ver %(echo %version | cut -d. -f1-3)
|
||||
%if "%{?kernel_longterm}" != "1"
|
||||
%define kernel_pl %(echo %version | cut -d. -f3)
|
||||
%endif
|
||||
@ -81,8 +82,8 @@
|
||||
%define _use_internal_dependency_generator 1
|
||||
|
||||
Name: kernel
|
||||
Version: 3.14.23
|
||||
Release: 1mamba
|
||||
Version: 3.14.24
|
||||
Release: 2mamba
|
||||
Summary: The Linux Kernel, the operating system core itself
|
||||
Group: System/Kernel and Hardware
|
||||
Vendor: openmamba
|
||||
@ -90,25 +91,25 @@ Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
#%if "%{?kernel_longterm}" == ""
|
||||
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-%{kernel_ver}.tar.xz
|
||||
%if "%{?kernel_pl}" != ""
|
||||
Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
|
||||
%endif
|
||||
#%if "%{?kernel_pl}" != ""
|
||||
#Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
|
||||
#%endif
|
||||
#%else
|
||||
#Source0: http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v%{kernel_ver}/linux-%{version}.tar.bz2
|
||||
#%endif
|
||||
Source7: %{name}-rt-i586-config
|
||||
Source8: %{name}-%{kernel_ver}-mamba-ppc-config
|
||||
Source8: %{name}-%{kernel_majver}-mamba-ppc-config
|
||||
Source9: %{name}-custom-i586-config
|
||||
Source11: %{name}-%{kernel_ver}-mamba-i586-config
|
||||
Source12: %{name}-%{kernel_ver}-mamba-x86_64-config
|
||||
Source13: %{name}-%{kernel_ver}-mamba-64GB-i586-config
|
||||
Source14: %{name}-%{kernel_ver}-mamba-xen-x86_64-config
|
||||
Source15: %{name}-%{kernel_ver}-mamba-arm-config
|
||||
Source16: %{name}-%{kernel_ver}-mamba-64GB-rt-i586-config
|
||||
Source17: %{name}-%{kernel_ver}-mamba-rt-i586-config
|
||||
Source18: %{name}-%{kernel_ver}-mamba-arm-kirkwood-config
|
||||
Source19: %{name}-%{kernel_ver}-mamba-x86_64-rt-config
|
||||
Source20: %{name}-%{kernel_ver}-mamba-arm-dove-config
|
||||
Source11: %{name}-%{kernel_majver}-mamba-i586-config
|
||||
Source12: %{name}-%{kernel_majver}-mamba-x86_64-config
|
||||
Source13: %{name}-%{kernel_majver}-mamba-64GB-i586-config
|
||||
Source14: %{name}-%{kernel_majver}-mamba-xen-x86_64-config
|
||||
Source15: %{name}-%{kernel_majver}-mamba-arm-config
|
||||
Source16: %{name}-%{kernel_majver}-mamba-64GB-rt-i586-config
|
||||
Source17: %{name}-%{kernel_majver}-mamba-rt-i586-config
|
||||
Source18: %{name}-%{kernel_majver}-mamba-arm-kirkwood-config
|
||||
Source19: %{name}-%{kernel_majver}-mamba-x86_64-rt-config
|
||||
Source20: %{name}-%{kernel_majver}-mamba-arm-dove-config
|
||||
Patch0: kernel-2.6.35-430-scsi_header_fix.patch
|
||||
# Ingo Molnar's RT patch
|
||||
Patch1: http://www.kernel.org/pub/linux/kernel/projects/rt/%{maj_rt_ver}/patch-%{rt_ver}.patch.xz
|
||||
@ -218,13 +219,14 @@ Obsoletes: kernel-%{KERNEL_TARGET}-drbd
|
||||
Provides: kernel = %{version}
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET} = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
%ifarch %ix86
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-nongpl-nvidia_173xx
|
||||
@ -254,13 +256,14 @@ Obsoletes: kernel26-std-source
|
||||
%endif
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-source = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-source
|
||||
Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-source
|
||||
@ -276,13 +279,14 @@ Summary: Headers, scripts, configuration and Makefile for the linux kernel
|
||||
Provides: kernelheaders = %{version}
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-headers
|
||||
|
||||
@ -297,13 +301,14 @@ Summary: Sanitised kernel headers used for glibc build
|
||||
Provides: kernelsanitisedheaders = %{version}
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-headers-sanitised = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-headers-sanitised
|
||||
Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-headers-sanitised
|
||||
@ -319,13 +324,14 @@ Requires: kernel-%{KERNEL_TARGET} == %{version}-%{release}
|
||||
Provides: kernelsound-%{KERNEL_TARGET}-%{kernel_ver} = %{version}
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-sound = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-sound
|
||||
Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-sound
|
||||
@ -342,13 +348,14 @@ Provides: kernelwireless-%{KERNEL_TARGET}-%{kernel_ver} = %{version}
|
||||
Requires: iwlwifi-firmware
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-wireless = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-wireless
|
||||
Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-wireless
|
||||
@ -364,13 +371,14 @@ Summary: Firmware files used by the Linux Kernel
|
||||
Requires: kernel-%{KERNEL_TARGET} == %{version}-%{release}
|
||||
## KERNELOBSOLETES-BEGIN 3.14
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware < 3.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_ver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.2
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.3
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.4
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.5
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.10
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.11
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.19
|
||||
Obsoletes: kernel-%{KERNEL_TARGET}-firmware = %{kernel_majver}.23
|
||||
## KERNELOBSOLETES-END
|
||||
Provides: kernel_%{KERNEL_TARGET}_%{kernel_ver}-firmware
|
||||
Obsoletes: kernel_%{KERNEL_TARGET}_%{kernel_ver}-firmware
|
||||
@ -406,14 +414,14 @@ rm -r linux-%{version}
|
||||
%endif
|
||||
|
||||
# add here subrelease patch
|
||||
%if "%{?kernel_longterm}" != "1"
|
||||
%if "%{?kernel_pl}" != ""
|
||||
echo "%{?kernel_pl}"
|
||||
xzcat -c %{SOURCE1} >/dev/null || exit 1
|
||||
xzcat -c %{SOURCE1} | patch -p1
|
||||
%endif
|
||||
%endif
|
||||
sed -i "s/\(SUBLEVEL =\).*/\1/" Makefile
|
||||
#%if "%{?kernel_longterm}" != "1"
|
||||
#%if "%{?kernel_pl}" != ""
|
||||
#echo "%{?kernel_pl}"
|
||||
#xzcat -c %{SOURCE1} >/dev/null || exit 1
|
||||
#xzcat -c %{SOURCE1} | patch -p1
|
||||
#%endif
|
||||
#%endif
|
||||
#sed -i "s/\(SUBLEVEL =\).*/\1/" Makefile
|
||||
|
||||
#
|
||||
# patch and configure STANDARD kernel
|
||||
@ -1061,6 +1069,12 @@ exit 0
|
||||
/lib/firmware/*
|
||||
|
||||
%changelog
|
||||
* Thu Nov 20 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.14.24-2mamba
|
||||
- restore SUBLEVEL in version to work better with dkms, but prepare to some bugfixing elsewhere
|
||||
|
||||
* Thu Nov 20 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.14.24-1mamba
|
||||
- update to 3.14.24
|
||||
|
||||
* Fri Oct 31 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 3.14.23-1mamba
|
||||
- update to 3.14.23
|
||||
|
||||
|
||||
BIN
patch-3.14.23.xz
BIN
patch-3.14.23.xz
Binary file not shown.
Loading…
Reference in New Issue
Block a user