From 1191044421f6094637d50ae4ebd1bd881bb8fa4e Mon Sep 17 00:00:00 2001 From: Evgenii Shatokhin Date: Sun, 11 Oct 2015 21:48:13 +0300 Subject: [PATCH] Updated to version 4.2.3 with additional changes The kernel was updated to version 4.2.3. 3rd party additions (ndiswrapper) have been dropped. The fixes for e1000e and mt7601u have been added as well, see "kernel-patches-and-configs" project, branch v4.2.x. --- .abf.yml | 4 +- ...repare-scripts-configs-in-devel-rpms.patch | 55 +++++++++---------- kernel.spec | 15 ++--- linux-4.1.tar.sign | 11 ---- linux-4.2.tar.sign | 11 ++++ patch-4.1.8.sign | 17 ------ patch-4.2.3.sign | 17 ++++++ 7 files changed, 60 insertions(+), 70 deletions(-) delete mode 100644 linux-4.1.tar.sign create mode 100644 linux-4.2.tar.sign delete mode 100644 patch-4.1.8.sign create mode 100644 patch-4.2.3.sign diff --git a/.abf.yml b/.abf.yml index 015b15b..fb5e0d1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - "linux-4.1.tar.xz": 2470435c2218f0bcbd46ef2a0000694aca340273 - "patch-4.1.8.xz": 6b3442749196b59b235cf94f1bd1eb92c1c25456 + "linux-4.2.tar.xz": 5e65d0dc94298527726fcd7458b6126e60fb2a8a + "patch-4.2.3.xz": 503069ea02345c5fd6e06dca3f2e107e9dcbc41c diff --git a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch index 208ad00..0043c8a 100644 --- a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch +++ b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch @@ -1,12 +1,8 @@ - - Makefile | 17 +++++------------ - scripts/kconfig/Makefile | 16 ---------------- - 2 files changed, 5 insertions(+), 28 deletions(-) - -diff -Nurp linux-4.1/Makefile linux-4.1-mrproper/Makefile ---- linux-4.1/Makefile 2015-06-25 21:00:39.742637102 +0200 -+++ linux-4.1-mrproper/Makefile 2015-06-25 21:12:36.256154446 +0200 -@@ -550,9 +550,7 @@ ifeq ($(KBUILD_EXTMOD),) +diff --git a/Makefile b/Makefile +index 6bb5283..612308f 100644 +--- a/Makefile ++++ b/Makefile +@@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),) # Carefully list dependencies so we do not try to build scripts twice # in parallel PHONY += scripts @@ -17,7 +13,7 @@ diff -Nurp linux-4.1/Makefile linux-4.1-mrproper/Makefile # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ -@@ -989,7 +987,7 @@ prepare0: archprepare FORCE +@@ -992,7 +990,7 @@ prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. # All the preparing.. @@ -26,7 +22,7 @@ diff -Nurp linux-4.1/Makefile linux-4.1-mrproper/Makefile # Generate some files # --------------------------------------------------------------------------- -@@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES +@@ -1174,13 +1172,8 @@ endif # CONFIG_MODULES CLEAN_DIRS += $(MODVERDIR) # Directories & files removed with 'make mrproper' @@ -42,7 +38,7 @@ diff -Nurp linux-4.1/Makefile linux-4.1-mrproper/Makefile # clean - Delete most, but leave enough to build external modules # -@@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean +@@ -1201,7 +1194,7 @@ clean: archclean vmlinuxclean # mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) @@ -51,48 +47,49 @@ diff -Nurp linux-4.1/Makefile linux-4.1-mrproper/Makefile PHONY += $(mrproper-dirs) mrproper archmrproper $(mrproper-dirs): -diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-mrproper/scripts/kconfig/Makefile ---- linux-4.1/scripts/kconfig/Makefile 2015-06-25 21:00:39.742637102 +0200 -+++ linux-4.1-mrproper/scripts/kconfig/Makefile 2015-06-25 21:20:05.362087673 +0200 +diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile +index ece8a70..cda1f92 100644 +--- a/scripts/kconfig/Makefile ++++ b/scripts/kconfig/Makefile @@ -19,23 +19,16 @@ endif unexport CONFIG_ - xconfig: $(obj)/qconf 3rdparty/Makefile + xconfig: $(obj)/qconf - $< $(silent) $(Kconfig) - gconfig: $(obj)/gconf 3rdparty/Makefile + gconfig: $(obj)/gconf - $< $(silent) $(Kconfig) - menuconfig: $(obj)/mconf 3rdparty/Makefile + menuconfig: $(obj)/mconf - $< $(silent) $(Kconfig) - config: $(obj)/conf 3rdparty/Makefile + config: $(obj)/conf - $< $(silent) --oldaskconfig $(Kconfig) - nconfig: $(obj)/nconf 3rdparty/Makefile + nconfig: $(obj)/nconf - $< $(silent) $(Kconfig) - silentoldconfig: $(obj)/conf 3rdparty/Makefile + silentoldconfig: $(obj)/conf - $(Q)mkdir -p include/config include/generated - $< $(silent) --$@ $(Kconfig) - localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile + localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/config include/generated -@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig +@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ PHONY += $(simple-targets) - $(simple-targets): $(obj)/conf 3rdparty/Makefile + $(simple-targets): $(obj)/conf - $< $(silent) --$@ $(Kconfig) PHONY += oldnoconfig savedefconfig defconfig -@@ -91,18 +83,10 @@ PHONY += oldnoconfig savedefconfig defco - oldnoconfig: olddefconfig 3rdparty/Makefile +@@ -91,18 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig + oldnoconfig: olddefconfig - savedefconfig: $(obj)/conf 3rdparty/Makefile + savedefconfig: $(obj)/conf - $< $(silent) --$@=defconfig $(Kconfig) - defconfig: $(obj)/conf 3rdparty/Makefile + defconfig: $(obj)/conf -ifeq ($(KBUILD_DEFCONFIG),) - $< $(silent) --defconfig $(Kconfig) -else @@ -100,7 +97,7 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-mrproper/scripts/kconfig - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) -endif - %_defconfig: $(obj)/conf 3rdparty/Makefile + %_defconfig: $(obj)/conf - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@) diff --git a/kernel.spec b/kernel.spec index 230f5ff..e207ee3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,9 +1,9 @@ %{?build_selinux}%{?!build_selinux:%bcond_with selinux} %define kernelversion 4 -%define patchlevel 1 +%define patchlevel 2 # sublevel is now used for -stable patches -%define sublevel 8 +%define sublevel 3 # Package release %define mibrel 1 @@ -45,7 +45,7 @@ # The revision of the patchset and the configs to use. Usually, the name of # the branch in https://abf.rosalinux.ru/soft/kernel-patches-and-configs/ # git repository. -%define revision v4.1.x +%define revision v4.2.x # When we are using a pre/rc patch, the tarball is a sublevel -1 %if %kpatch @@ -980,7 +980,7 @@ The %{kname}-source package contains the source code files for the Mandriva and ROSA kernel. These source files are only needed if you want to build your own custom kernel that is better tuned to your particular hardware. -If you only want the files needed to build 3rdparty (nVidia, Ati, dkms-*,...) +If you only want the files needed to build 3rdparty (dkms-*,...) drivers against, install the *-devel-* rpm that is matching your kernel. # @@ -1183,10 +1183,6 @@ PrepareKernel() { %endif echo "Make config for kernel $extension" - pushd 3rdparty - perl mkbuild.pl - popd - %smake -s mrproper if [ "%{target_arch}" == "i386" -o "%{target_arch}" == "x86_64" ]; then @@ -1280,7 +1276,6 @@ SaveDevel() { for f in $(find arch/%{target_arch} -name include); do cp -fR --parents $f $TempDevelRoot; done %endif cp -fR .config Module.symvers $TempDevelRoot - cp -fR 3rdparty/mkbuild.pl $TempDevelRoot/3rdparty # Needed for truecrypt build (Danny) cp -fR drivers/md/dm.h $TempDevelRoot/drivers/md/ @@ -1347,7 +1342,6 @@ cat > $kernel_devel_files <