mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 18:42:55 +00:00
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.
This commit is contained in:
Evgenii Shatokhin
parent
b49f9545ae
commit
1191044421
7 changed files with 60 additions and 70 deletions
4
.abf.yml
4
.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
|
||||
|
|
|
|||
|
|
@ -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/$@)
|
||||
|
|
|
|||
15
kernel.spec
15
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 <<EOF
|
|||
%dir $DevelRoot
|
||||
%dir $DevelRoot/arch
|
||||
%dir $DevelRoot/include
|
||||
$DevelRoot/3rdparty
|
||||
$DevelRoot/Documentation
|
||||
%ifarch %{arm}
|
||||
$DevelRoot/arch/arm
|
||||
|
|
@ -1883,7 +1877,6 @@ rm -rf %{buildroot}
|
|||
%dir %{_kerneldir}
|
||||
%dir %{_kerneldir}/arch
|
||||
%dir %{_kerneldir}/include
|
||||
%{_kerneldir}/3rdparty
|
||||
%{_kerneldir}/Documentation
|
||||
%{_kerneldir}/arch/Kconfig
|
||||
%{_kerneldir}/arch/arm
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
-----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-----
|
||||
11
linux-4.2.tar.sign
Normal file
11
linux-4.2.tar.sign
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQEcBAABAgAGBQJV405DAAoJEHm+PkMAQRiGRfkH/0DD5vbH9LS+gqnAhZ2ZXvJ2
|
||||
VkzvQJST4gHJ3tDZKY6k66ajSkW/72XhoAV8dQecBIQSIZf1l6OFGqqFw4bf5vio
|
||||
lec/x34Mu2LCXyred4OXJ6eubvWxbZzvSTRdd/U4f2hHfw2Ga/7AtvHpmsmEAR+K
|
||||
qLmrDq6/5FuwEcQvuWO1INsBJcGNnfGlxZc5BC3WaGIRFDnVw0jOa4QWJHRs7bTe
|
||||
Dz7wrVwZetlYEvJKscJBjfnjezPRsdIUW+aCe8XwEg+eeMYkM114ssB4rXojQEZc
|
||||
hDzarLFHfqWfOnoOcjdASNjOCj12VfA9JGEuarxoL49hWPDobbhfy5ER+FyyCdc=
|
||||
=5Yjs
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAABCAAGBQJWADkSAAoJEDjbvchgkmk+IQQP/0lZiNX6j52ARRhex086dWVJ
|
||||
kb10GRubFBKtVePrC59IB4bZRDLZhvKcVoJYaF2WKII33VX/EruYdiKFk+AxnQNb
|
||||
nDShsrPqSSpvV1xXGaTZ59ivTnrgI3jwTq84wrK6eL+XnjF87zpvDCgLp01QZrbm
|
||||
EDC55rF132K3PqqJSOenx5wW3ktGIu/spttEWRjdhRlO/OAeXgaxx7DddQ7WYdC+
|
||||
jZ+sUA5XeEDtSkvgHkNJw1sWsexFyjMRx9XgJl0HLRQnasShfNr8cIvEvpemyAWL
|
||||
eI86bUxJ7IR2iz1oTeq+HHAeIbjHAt2W24hGNqWSMC8FyIilHGLG370/nx3Y0ajz
|
||||
ZC3O3lt0sYDTHbJfj49gVKf87p8pWHqFBc3UPlao0PApUdKzefl025z6Iiv/RBhZ
|
||||
BKhBuNP+5tKvs8LTtyZvsXfJS97Kc7BWCrXCaJKezu0vA+cUpIZsHa40z/LiW7lf
|
||||
6C9PciXC4ux3L+mGAYWZSuct6lu3DNvXDx0QjGUCOsB/3SLj42GK4dqCXqP5QODL
|
||||
bOBrN1tvNYjrtby1g0DDM/dKX4PDr9BE/liEgq7FtxHJxP/+t3sr+DqDxKt5qLjG
|
||||
xGOetGbOU/PY4YLtWK8dQMpu27Uo3VkQXkbm9JaSJbME3A9Y6gYQyk0VR5X6B8q4
|
||||
AMr7ozhA3D+lAgWDs0va
|
||||
=R0kB
|
||||
-----END PGP SIGNATURE-----
|
||||
17
patch-4.2.3.sign
Normal file
17
patch-4.2.3.sign
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAABCAAGBQJWD8GKAAoJEDjbvchgkmk+n64P/jPcg1iqAx8+hnEaBWtxPYHA
|
||||
N73XBvP8JQl+11sRZfyY7rrgTUYJzj9Mw/G9gvNI2EJ7B/QQJVgnEX95LkUuSOi6
|
||||
6kMj+/vIewcYtHvfctHkyR4nFSMAx6iBrTnudWXXywZgxIhYnz7a92uurBWWKZug
|
||||
HSKpal+xn6jA+MIGtbFqREBJksI307FZFpnVMS/wWoVdicsipBn9h1b3A8BZfEBs
|
||||
sw8I9bE8yD/c+5nT+xglKXBdFpYl442YNGM86K/8aNkx+u6WFfbSc6dsxP4P+LdT
|
||||
iRBpknUe+5SJCSna2W2pZy3r+tWt3TzyuwGLCA70YBB1B/JoVaEhIHKxJva39Mqs
|
||||
SdSCTP1bQJlI9Ze5uY0a2nTArbb1fRCzhvbx0fB8i3RdpJoDBiCfLG2QDiSIgOkS
|
||||
ETbopFyKUTpOD6vbgxlquCtmRCzJCCGSpS6w4vBGxNpjb9x49eIi4CZXQqKCdpv2
|
||||
wzcO6w1VGdycmkGeA71G/jcIXK0vNPn5pdjGycZcLXC2TjvF2UsFTAwaCrPmz2uI
|
||||
tSCsAMPijRmaeuf0l7fIh096P350Ea6V5JxO8HPYrz7c75jn0BH6+mletq47AgJU
|
||||
iI/xUJL8IkJisZdgyVc/yJWuV79e11CfwYb+LchH8vmkv39gto58VefcqoRZp2Pf
|
||||
hg/HfXwzK/2AYmv2Sxql
|
||||
=YGqT
|
||||
-----END PGP SIGNATURE-----
|
||||
Loading…
Add table
Reference in a new issue