- up to 4.15.6

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index a2b6980b0621a0a6d283ead4d50e590a0cea6407..7e1cfe90e1e430d7be9f899fd91b5dd4710ce6cc 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,9 +68,9 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             4
-%define                basever         4.14
-%define                postver         .2
+%define                rel             1
+%define                basever         4.15
+%define                postver         .6
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       %{nil}
@@ -119,10 +119,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5: bacdb9ffdcd922aa069a5e1520160e24
+# Source0-md5: 0d701ac1e2a67d47ce7127432df2c32b
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  92f71f8a1c5c28b7c8b4a95f6c9dd048
+# Patch0-md5:  d8fcd87cd22155a7aa73126429446253
 %endif
 Source1:       kernel.sysconfig
 
@@ -216,9 +216,9 @@ Patch2000:  kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
 Patch2003:     kernel-regressions.patch
 
-# https://gitlab.com/apparmor/apparmor/tree/master/kernel-patches/v4.14
-Patch5001:     0012-apparmor-add-base-infastructure-for-socket-mediation.patch
-Patch5002:     0001-UBUNTU-SAUCE-apparmor-af_unix-mediation.patch
+# https://gitlab.com/apparmor/apparmor/tree/master/kernel-patches/v4.15
+Patch5001:     0001-apparmor-add-base-infastructure-for-socket-mediation.patch
+Patch5002:     0002-apparmor-af_unix-mediation.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
@@ -237,7 +237,7 @@ BuildRequires:      binutils >= 3:2.18
 BuildRequires: elftoaout
 %endif
 BuildRequires: elfutils-devel
-BuildRequires: gcc >= 5:3.2
+BuildRequires: gcc >= 6:7.2.0-6
 BuildRequires: gcc-plugin-devel
 BuildRequires: hostname
 BuildRequires: kmod >= 12-2
@@ -700,6 +700,8 @@ rm -f localversion-rt
 # Do not remove this, please!
 #%%patch50000 -p1
 
+chmod 755 tools/objtool/sync-check.sh
+
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:.%{alt_kernel}}#g' Makefile