Prepared the initial variant of the kernel 4.1.1

2025-02-24 17:22:50 +00:00 · 2015-07-01 16:47:47 +03:00 · 2015-07-01 16:47:47 +03:00 · a6ca9ce2cf
commit a6ca9ce2cf
parent d62eb50f9d
7 changed files with 78 additions and 88 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -1,3 +1,3 @@
 sources:
-  "linux-4.0.tar.xz": 6d63cf9a589d951338a3da50c506007c5ba18814
-  "patch-4.0.7.xz": ed407f4cf752283b5a12d62dad35511264ec1f34
+  "linux-4.1.tar.xz": 2470435c2218f0bcbd46ef2a0000694aca340273
+  "patch-4.1.1.xz": 2b8d258b0d5ccab320ec21b58e15d5f19051875b
--- a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
+++ b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
@ -1,8 +1,12 @@
-diff --git a/Makefile b/Makefile
-index fbd43bf..48c61ca 100644
--- a/Makefile
-+++ b/Makefile
-@@ -552,9 +552,7 @@ ifeq ($(KBUILD_EXTMOD),)
+
+ 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),)
 # Carefully list dependencies so we do not try to build scripts twice
 # in parallel
 PHONY += scripts
@ -13,7 +17,7 @@ index fbd43bf..48c61ca 100644
 
 # Objects we will link into vmlinux / subdirs we need to visit
 init-y		:= init/
-@@ -990,7 +988,7 @@ prepare0: archprepare FORCE
+@@ -989,7 +987,7 @@ prepare0: archprepare FORCE
 	$(Q)$(MAKE) $(build)=.
 
 # All the preparing..
@ -22,7 +26,7 @@ index fbd43bf..48c61ca 100644
 
 # Generate some files
 # ---------------------------------------------------------------------------
-@@ -1178,13 +1176,15 @@ endif # CONFIG_MODULES
+@@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES
 CLEAN_DIRS  += $(MODVERDIR)
 
 # Directories & files removed with 'make mrproper'
@ -33,19 +37,12 @@ index fbd43bf..48c61ca 100644
 -		  signing_key.priv signing_key.x509 x509.genkey		\
 -		  extra_certificates signing_key.x509.keyid		\
 -		  signing_key.x509.signer vmlinux-gdb.py
-+#MRPROPER_DIRS  += include/config usr/include include/generated          \
-+#		  arch/*/include/generated .tmp_objdiff
-+#MRPROPER_FILES += .config .config.old .version .old_version \
-+#		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
-+#		  signing_key.priv signing_key.x509 x509.genkey		\
-+#		  extra_certificates signing_key.x509.keyid		\
-+#		  signing_key.x509.signer vmlinux-gdb.py
 +MRPROPER_DIRS  += ""
 +MRPROPER_FILES += ""
 
 # clean - Delete most, but leave enough to build external modules
 #
-@@ -1205,7 +1205,7 @@ clean: archclean vmlinuxclean
+@@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean
 #
 mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
 mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
@ -54,67 +51,57 @@ index fbd43bf..48c61ca 100644
 
 PHONY += $(mrproper-dirs) mrproper archmrproper
 $(mrproper-dirs):
-diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index 9645c07..9d147f9 100644
--- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -15,26 +15,18 @@ endif
+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
+@@ -19,23 +19,16 @@ endif
 unexport CONFIG_
 
 xconfig: $(obj)/qconf 3rdparty/Makefile
-	$< $(Kconfig)
+-	$< $(silent) $(Kconfig)
 
 gconfig: $(obj)/gconf 3rdparty/Makefile
-	$< $(Kconfig)
+-	$< $(silent) $(Kconfig)
 
 menuconfig: $(obj)/mconf 3rdparty/Makefile
-	$< $(Kconfig)
+-	$< $(silent) $(Kconfig)
 
 config: $(obj)/conf 3rdparty/Makefile
-	$< --oldaskconfig $(Kconfig)
+-	$< $(silent) --oldaskconfig $(Kconfig)
 
 nconfig: $(obj)/nconf 3rdparty/Makefile
-	$< $(Kconfig)
- 
- oldconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@ $(Kconfig)
+-	$< $(silent) $(Kconfig)
 
 silentoldconfig: $(obj)/conf 3rdparty/Makefile
 -	$(Q)mkdir -p include/config include/generated
-	$< --$@ $(Kconfig)
+-	$< $(silent) --$@ $(Kconfig)
 
 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
 	$(Q)mkdir -p include/config include/generated
-@@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
- PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
+@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig
+ PHONY += $(simple-targets)
 
- allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@ $(Kconfig)
+ $(simple-targets): $(obj)/conf 3rdparty/Makefile
+-	$< $(silent) --$@ $(Kconfig)
 
- PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
+ PHONY += oldnoconfig savedefconfig defconfig
 
- listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@ $(Kconfig)
- 
- # oldnoconfig is an alias of olddefconfig, because people already are dependent
- # on its behavior(sets new symbols to their default value but not 'n') with the
- # counter-intuitive name.
- oldnoconfig: $(obj)/conf 3rdparty/Makefile
-	$< --olddefconfig $(Kconfig)
+@@ -91,18 +83,10 @@ PHONY += oldnoconfig savedefconfig defco
+ oldnoconfig: olddefconfig 3rdparty/Makefile
 
 savedefconfig: $(obj)/conf 3rdparty/Makefile
-	$< --$@=defconfig $(Kconfig)
+-	$< $(silent) --$@=defconfig $(Kconfig)
 
 defconfig: $(obj)/conf 3rdparty/Makefile
 -ifeq ($(KBUILD_DEFCONFIG),)
-	$< --defconfig $(Kconfig)
+-	$< $(silent) --defconfig $(Kconfig)
 -else
-	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+-	@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+-	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 -endif
 
 %_defconfig: $(obj)/conf 3rdparty/Makefile
-	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+-	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 
- configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)
+ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
 
--- a/kernel.spec
+++ b/kernel.spec
@ -1,12 +1,12 @@
 %{?build_selinux}%{?!build_selinux:%bcond_with selinux}

 %define kernelversion	4
-%define patchlevel	0
+%define patchlevel	1
 # sublevel is now used for -stable patches
-%define sublevel	7
+%define sublevel	1

 # Package release
-%define mibrel		69
+%define mibrel		1

 # kernel Makefile extraversion is substituted by
 # kpatch wich are either 0 (empty), rc (kpatch)
@ -33,7 +33,8 @@
 %endif

 # fakerel and fakever never change, they are used to fool
-# rpm/urpmi/smart
+# rpm/urpmi/smart and ensure the kernels are installed,
+# not upgraded so old kernel is not overwritten or removed
 %define fakever		1
 %define fakerel 	%mkrel 1

@ -86,7 +87,7 @@
 %define debug_package 		%{nil}

 # Build defines
-%define build_doc 			1
+%define build_doc 		1
 %define build_source 		1
 %define build_devel 		1

@ -411,8 +412,8 @@ processor mode, use the "nosmp" boot parameter.
 ### Global Requires/Provides

 %define requires1	grub2
-%define requires2	dracut >= 017-16
-%define requires3	kmod >= 7-6
+%define requires2	dracut >= 041-11
+%define requires3	kmod >= 20-1
 %define requires4	sysfsutils >=  2.1.0-12
 %define requires5	kernel-firmware >=  20120219-1

@ -425,10 +426,10 @@ processor mode, use the "nosmp" boot parameter.
 %define	kobsoletes2	dkms-lzma <= 4.43-32
 %define	kobsoletes3	dkms-psb <= 4.41.1-7

-# conflict dkms packages that dont support kernel-3.14
-# all driver versions must be carefully checked to add
+# Add conflicts with the dkms packages that do not support this kernel.
+# All driver versions must be carefully checked before adding them here.

-%define kconflicts1	dkms-broadcom-wl < 6.30.223.141-6
+%define kconflicts1	dkms-broadcom-wl < 6.30.223.248-3
 %define kconflicts2	dkms-fglrx < 14.10.1006.1001-1
 %define kconflicts3	dkms-nvidia-current < 331.38-5
 %define kconflicts4	dkms-nvidia-long-lived < 304.108-8
@ -1366,6 +1367,7 @@ $DevelRoot/include/drm
 $DevelRoot/include/dt-bindings
 $DevelRoot/include/generated
 $DevelRoot/include/keys
+$DevelRoot/include/kvm
 $DevelRoot/include/linux
 $DevelRoot/include/math-emu
 $DevelRoot/include/media
@ -1896,6 +1898,7 @@ rm -rf %{buildroot}
 %{_kerneldir}/include/drm
 %{_kerneldir}/include/dt-bindings
 %{_kerneldir}/include/keys
+%{_kerneldir}/include/kvm
 %{_kerneldir}/include/linux
 %{_kerneldir}/include/math-emu
 %{_kerneldir}/include/media
--- a/linux-4.0.tar.sign
+++ b/linux-4.0.tar.sign
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJVKvRfAAoJEHm+PkMAQRiG9HMH/3uQ7/NkMdfH3TZSnQfWhIu0
-LDhYv2I6GmQzsab17fr2BsuMifimmsnNbt3Krmvlk0UtWb7tVqAF92kp+7pdh9ak
-tBo2nKKqDxwmzqxBa16uHoewqG/6ucwD5LnMuP3F28uOdqrTjqlCusM2bMi65VwO
-+hGE4PMJTc12skLthFc/Xz+OKiPUAU3VdtqAXgHqLHA0cFJqU+x8M+dWAhbH+aD9
-SgMOhcdc79xhi6fgdbqUOxwdq8fNYPO2vGKkV6oahZxP4RYCYpBgZ23a++BFFU9F
-d4ik8JK23iQnSY+NXLgoqotNRJkPIjOVJO9AFMcCj+mlYsEWQs/qhNohZdSQeRc=
-=udj5
-----END PGP SIGNATURE-----
--- a/linux-4.1.tar.sign
+++ b/linux-4.1.tar.sign
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJVh5nCAAoJEHm+PkMAQRiG4+oIAIXe2H1ekRRwkzx/wBwTBtoW
+NVLeyqA8JpNcBKT26Gut3SaRQ2mVZa9j+kb5un7WAm8cEXtMBiJOCW6ywh029tg7
+2j0/3EfX384erR3+Z5cgBZoExZWrReZc52YcrEnndBZSj3wcjM4zIan7Ec9xEGpx
+2pnZuhZx1M0rW2Yc/5GdiYWqfSi0ZASPUzgOx6WPxjAuzfqXL1OxR9wU7M4K0fH7
+fykAI3024h+WEvRW+P5eQ45twJdRUuRkKxTDPZhkPF+pUqLz5akuwlcvFyXiDv+1
+iWsN02ApEkcmWkzbaaxTEGuCsBtRPEAdhpP82VFRpvokytCwJaQAPCScxg48YX4=
+=rJX5
+-----END PGP SIGNATURE-----
--- a/patch-4.0.7.sign
+++ b/patch-4.0.7.sign
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJVkZysAAoJEDjbvchgkmk+/NwP/j1IQjBPUhb6AnG9NAn9SCEw
-o/npNeHNq78AS7bXYwXPb3S3o1fCNf8lWcd4y5tcZnicibtruyKJASxC5+aF/20N
-Fd79wqYRIFNzlVT79ipfnKR12k7k4C5LZdhEaTGbl3L/vrzlW7/NkMbLEF+S00gN
-HwLJZRhZe3A/7Zgg5O/nUnA1ih4m9FyDjtwEIZ0uE18yubEEtZ76xOXEAjeAQOEH
-WKbhuXwR4xeqyzhmBhbnCt4MOcaQDB6yiaUCUqxCEd+KWCR+37uLktEx8XKOAwAo
-BHgpGY+DkC/Zv3z5elyCyoY4lvaRjqHjw575RLQGLnCwd7/JswlR84zAxNslC7C7
-sB39un1xtsIT/yL6IvsqHg5l4kHOZ5oy155I5XSvfFl1o6XbL+d86awh1kD9lu9/
-qrJMlAUqug2qkEc2xZ9YfyTAvCbfD0oJK8pokJJPjqD7BiGILJ57DRHQVWUI2URG
-L/qySiyOAuqDRVzoH5HwkPt7aMXyIaS6Kcx752xz1kjJLOgGtXWiliqsnl9NLn4Z
-TskdF6z389Bj3niFwaxr3AAziIqvFCf8PXMMF3bDlZLzAgnEjD50Yke0Ax55nVxo
-ZJicFAT4c3Z7vkjh8658Ka2DUVycdC5lOVp2/DwTpXA5pyTB1FOABt6nuxEeEdPb
-TSYcwQJ5hhzwG6mgBUkX
-=dUy3
-----END PGP SIGNATURE-----
--- a/patch-4.1.1.sign
+++ b/patch-4.1.1.sign
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVkaLJAAoJEDjbvchgkmk+tn8P/RAe2TABD39tepKhxVlHRn+A
+lu2QCCJIXa9FAEegM7n1aNplz/WYuxbFCPXnGfxcVJ1uvASJpOgBCQl3M1J24xxf
+/ez97YB+Bo/JK/irxuxPK6B1vgjLHm4lVcRsziRo6vKy4oKs34C4LgBAtNoZun9e
+3WAcvZGMSlGsmzrXyNXcmeACJkWdv5uE3Q5N40zR5bAy3DBCPZL7akgihbgV3WyB
+axoARlP9NMfL9m3XzLvFo5btwkJex9IV0IfG5QsgAe+xdeho1vIxyBdbyrptXn18
+saNrxw2avc7ry0Y/8FVik6qFnw2sXmEUjOejaQjp53o0aWC2232EPqH1FpHLJhSn
+npuAYEpGgAZivp3wkAncE7bFG6JW+abVorwCw+YvONX7azsXtaTunD13xhLGx7L6
+AtdJsWt5IWqB2KFGvStULbfqg/MK2mG/Pp40bB66z2PX7ru89nIOg76tx8RvASzT
+hZA3qY+P/UCFWab9Hhc9813dg0Ve0XLZgMBhUmbFH3Gh3dcu/rO5g5Xu3jXjAQsu
+ye5B0jiki1+mr4owhovyzfY3L/uQSQKM58q3h/7WP0ofWbiwmthg7hgIY6dBVR9s
+Cd6HYOuQEXIPYodCjWVxg5m5VwTjNjrNBTwnICWiBSptjV0IGqh6xCsJupq24Bku
+d/HwhVanqbRCOZojx0ja
+=K3BD
+-----END PGP SIGNATURE-----