build without grsec and old module-init-tools

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 3ee06d010fbc9cd5f09b09378ff0a29a1af2b710..75e37c126f3855b5efd34cb46d2a54214969a0a5 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -114,7 +114,7 @@
 %endif
 
 %define                basever         2.6.32
-%define                postver         .15
+%define                postver         .63
 %define                rel             1
 
 %define                _enable_debug_packages                  0
@@ -127,14 +127,14 @@
 %define                alt_kernel      myown
 %endif
 %else
-%if %{without rescuecd}
 %define                __alt_kernel    %{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define                alt_kernel      %{__alt_kernel}
 %endif
-%else
-%define                alt_kernel      rescuecd
 %endif
+
+%if %{with rescuecd}
+%define                alt_kernel      rescuecd
 %endif
 
 # kernel release (used in filesystem and eventually in uname -r)
@@ -157,10 +157,9 @@ Group:             Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
 # Source0-md5: 260551284ac224c3a43c4adac7df4879
 %if "%{postver}" != "%{nil}"
-Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 5c9251844c2819eddee4dba1293bd46d
+Patch1:                http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v%{basever}/patch-%{version}.xz
+# Patch1-md5:  bcde8b57108d4989765a616b4b8ff301
 %endif
-
 Source3:       kernel-autoconf.h
 Source4:       kernel-config.h
 Source6:       kernel-config.awk
@@ -271,7 +270,7 @@ Patch85:    kernel-hostap.patch
 # Taken from http://download.opensuse.org/factory/repo/src-oss/suse/src/kernel-source-2.6.30-10.3.src.rpm
 Patch90:       kernel-mpt-fusion.patch
 
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.32.8-vs2.3.0.36.29.1.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.32.63-vs2.3.0.36.30.diff
 Patch100:      kernel-vserver-2.3.patch
 Patch101:      kernel-vserver-fixes.patch
 
@@ -338,8 +337,10 @@ BuildRequires:     elftoaout
 %ifarch ppc
 BuildRequires: uboot-mkimage
 %endif
+##BuildRequires:       gcc < 6:4.6
 BuildRequires: /sbin/depmod
 BuildRequires: gcc >= 5:3.2
+BuildRequires: tar >= 1:1.22
 BuildRequires: xz >= 1:4.999.7
 AutoReqProv:   no
 # for hostname command
@@ -356,8 +357,8 @@ Requires:   geninitrd >= 10000-3
 Requires:      module-init-tools >= 0.9.9
 Provides:      %{name}(netfilter) = %{netfilter_snap}
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel-firmware
 Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
+Obsoletes:     kernel-firmware
 Obsoletes:     kernel-misc-acer_acpi
 Obsoletes:     kernel-misc-fuse
 Obsoletes:     kernel-misc-uvc
@@ -421,7 +422,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                topdir          %{_builddir}/%{name}-%{version}
 %define                srcdir          %{topdir}/linux-%{basever}
 %define                objdir          %{topdir}/%{targetobj}
-%define                targetobj       %{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
+%define                targetobj       %{_target_base_arch}-gcc-%(%{__cc} -dumpversion)
 
 %define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
 
@@ -694,7 +695,7 @@ cd linux-%{basever}
 sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 
 %if "%{postver}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
+%patch1 -p1
 %endif
 
 # tuxonice:
@@ -1130,6 +1131,8 @@ touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
 for a in \
        dep{,.bin} \
        alias{,.bin} \
+       devname \
+       softdep \
        symbols{,.bin} \
        {pci,usb,ccw,isapnp,input,ieee1394,serio,of}map \
 ; do
@@ -1141,11 +1144,11 @@ install -d $RPM_BUILD_ROOT/boot
 cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
 %ifarch %{ix86} %{x8664}
 cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
+install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
 %ifarch ppc ppc64
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
+install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
 %ifarch ia64
 %{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
@@ -1383,6 +1386,8 @@ fi
 %ghost /lib/modules/%{kernel_release}/modules.ofmap
 %ghost /lib/modules/%{kernel_release}/modules.pcimap
 %ghost /lib/modules/%{kernel_release}/modules.seriomap
+%ghost /lib/modules/%{kernel_release}/modules.devname
+%ghost /lib/modules/%{kernel_release}/modules.softdep
 %ghost /lib/modules/%{kernel_release}/modules.symbols
 %ghost /lib/modules/%{kernel_release}/modules.symbols.bin
 %ghost /lib/modules/%{kernel_release}/modules.usbmap