mirror of
https://abf.rosa.ru/djam/kernel-6.7-xanmod.git
synced 2025-02-24 01:22:47 +00:00
Updated to 5.10.1-xanmod1
This commit is contained in:
kelpee (Sergey)
parent
de16b32fae
commit
5ec069a075
7 changed files with 536 additions and 560 deletions
4
.abf.yml
4
.abf.yml
|
|
@ -1,4 +1,4 @@
|
|||
sources:
|
||||
linux-5.9.tar.xz: 0617d9e190869ec11f2a28791f2cbd34c250f51b
|
||||
patch-5.9.14-xanmod1.xz: c1c9826b8d0facd448ada58e470fa4f174acfbbc
|
||||
linux-5.10.tar.xz: be0b909f1fbb760cc2d5cf146e1da3b2af0cf899
|
||||
patch-5.10.1-xanmod1.xz: 9ccc7f9704ccbc01dd9d145b82e32dc4cf607c66
|
||||
|
||||
|
|
|
|||
|
|
@ -1,116 +0,0 @@
|
|||
diff -Naur linux-5.9.orig/Makefile linux-5.9/Makefile
|
||||
--- linux-5.9.orig/Makefile 2020-10-17 11:53:33.379114870 +0300
|
||||
+++ linux-5.9/Makefile 2020-10-17 11:53:34.941114897 +0300
|
||||
@@ -1178,8 +1178,7 @@
|
||||
# Carefully list dependencies so we do not try to build scripts twice
|
||||
# in parallel
|
||||
PHONY += scripts
|
||||
-scripts: scripts_basic scripts_dtc
|
||||
- $(Q)$(MAKE) $(build)=$(@)
|
||||
+scripts:
|
||||
|
||||
# Things we need to do before we recursively start building the kernel
|
||||
# or the modules are listed in "prepare".
|
||||
@@ -1198,7 +1197,7 @@
|
||||
$(Q)$(MAKE) $(build)=.
|
||||
|
||||
# All the preparing..
|
||||
-prepare: prepare0 prepare-objtool prepare-resolve_btfids
|
||||
+prepare:
|
||||
|
||||
# Support for using generic headers in asm-generic
|
||||
asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
|
||||
@@ -1462,15 +1461,8 @@
|
||||
modules.builtin modules.builtin.modinfo modules.nsdeps
|
||||
|
||||
# Directories & files removed with 'make mrproper'
|
||||
-MRPROPER_FILES += include/config include/generated \
|
||||
- arch/$(SRCARCH)/include/generated .tmp_objdiff \
|
||||
- debian snap tar-install \
|
||||
- .config .config.old .version \
|
||||
- Module.symvers \
|
||||
- signing_key.pem signing_key.priv signing_key.x509 \
|
||||
- x509.genkey extra_certificates signing_key.x509.keyid \
|
||||
- signing_key.x509.signer vmlinux-gdb.py \
|
||||
- *.spec
|
||||
+MRPROPER_DIRS += ""
|
||||
+MRPROPER_FILES += ""
|
||||
|
||||
# Directories & files removed with 'make distclean'
|
||||
DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
|
||||
@@ -1490,13 +1482,10 @@
|
||||
# mrproper - Delete all generated files, including .config
|
||||
#
|
||||
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
||||
-mrproper-dirs := $(addprefix _mrproper_,scripts)
|
||||
|
||||
-PHONY += $(mrproper-dirs) mrproper
|
||||
-$(mrproper-dirs):
|
||||
- $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
|
||||
+PHONY += mrproper
|
||||
|
||||
-mrproper: clean $(mrproper-dirs)
|
||||
+mrproper: clean
|
||||
$(call cmd,rmfiles)
|
||||
|
||||
# distclean
|
||||
diff -Naur linux-5.9.orig/scripts/kconfig/Makefile linux-5.9/scripts/kconfig/Makefile
|
||||
--- linux-5.9.orig/scripts/kconfig/Makefile 2020-10-17 11:53:33.021114863 +0300
|
||||
+++ linux-5.9/scripts/kconfig/Makefile 2020-10-17 11:53:34.941114897 +0300
|
||||
@@ -20,19 +20,14 @@
|
||||
unexport CONFIG_
|
||||
|
||||
xconfig: $(obj)/qconf
|
||||
- $< $(silent) $(Kconfig)
|
||||
|
||||
gconfig: $(obj)/gconf
|
||||
- $< $(silent) $(Kconfig)
|
||||
|
||||
menuconfig: $(obj)/mconf
|
||||
- $< $(silent) $(Kconfig)
|
||||
|
||||
config: $(obj)/conf
|
||||
- $< $(silent) --oldaskconfig $(Kconfig)
|
||||
|
||||
nconfig: $(obj)/nconf
|
||||
- $< $(silent) $(Kconfig)
|
||||
|
||||
build_menuconfig: $(obj)/mconf
|
||||
|
||||
@@ -48,11 +43,9 @@
|
||||
cmp -s .tmp.config .config || \
|
||||
(mv -f .config .config.old.1; \
|
||||
mv -f .tmp.config .config; \
|
||||
- $< $(silent) --oldconfig $(Kconfig); \
|
||||
mv -f .config.old.1 .config.old) \
|
||||
else \
|
||||
mv -f .tmp.config .config; \
|
||||
- $< $(silent) --oldconfig $(Kconfig); \
|
||||
fi
|
||||
$(Q)rm -f .tmp.config
|
||||
|
||||
@@ -68,24 +61,14 @@
|
||||
PHONY += $(simple-targets)
|
||||
|
||||
$(simple-targets): $(obj)/conf
|
||||
- $< $(silent) --$@ $(Kconfig)
|
||||
|
||||
PHONY += savedefconfig defconfig
|
||||
|
||||
savedefconfig: $(obj)/conf
|
||||
- $< $(silent) --$@=defconfig $(Kconfig)
|
||||
|
||||
defconfig: $(obj)/conf
|
||||
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
|
||||
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
|
||||
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
|
||||
-else
|
||||
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
|
||||
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
|
||||
-endif
|
||||
|
||||
%_defconfig: $(obj)/conf
|
||||
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
|
||||
|
||||
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
|
||||
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
17
kernel.spec
17
kernel.spec
|
|
@ -1,12 +1,12 @@
|
|||
%define kernelversion 5
|
||||
%define patchlevel 9
|
||||
%define patchlevel 10
|
||||
# sublevel is used for stable-based kernels
|
||||
%define sublevel 14
|
||||
%define sublevel 1
|
||||
%define patch_name xanmod
|
||||
%define patch_rel 1
|
||||
|
||||
# Release number. Increase this before a rebuild.
|
||||
%define rpmrel 1
|
||||
%define rpmrel 2
|
||||
|
||||
%define fullrpmrel %{rpmrel}
|
||||
|
||||
|
|
@ -158,7 +158,6 @@ Source14: kernel.rpmlintrc
|
|||
|
||||
# This is for disabling *config, mrproper, prepare, scripts on -devel rpms
|
||||
# Needed, because otherwise the -devel won't build correctly.
|
||||
Source20: disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
|
||||
|
||||
####################################################################
|
||||
|
||||
|
|
@ -180,13 +179,8 @@ Patch10: perf-xmlto-skip-validation.patch
|
|||
# http://bugs.rosalinux.ru/show_bug.cgi?id=6459
|
||||
Patch11: audit-make-it-less-verbose.patch
|
||||
|
||||
#if #{mdvver} >= 201900
|
||||
# May help when building with GCC 8+.
|
||||
#Patch105: perf-silence-format-warnings-gcc8.patch
|
||||
#endif
|
||||
|
||||
# Other patches
|
||||
Patch13: objtool-sync-check.sh-set-the-exit-code-explicitly.patch
|
||||
|
||||
####################################################################
|
||||
|
||||
Autoreqprov: no
|
||||
|
|
@ -884,9 +878,6 @@ rm -f %{temp_devel_root}/.config.old
|
|||
# fix permissions
|
||||
chmod -R a+rX %{temp_devel_root}
|
||||
|
||||
# disable mrproper in -devel rpms
|
||||
patch -p1 --fuzz=0 -d %{temp_devel_root} -i %{SOURCE20}
|
||||
|
||||
# Create the symlinks needed by DKMS
|
||||
mkdir -p %{temp_modules}/%{kver_full}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 6b70660e7d730b1ef79360ba7c23fc9f1d4b60e3 Mon Sep 17 00:00:00 2001
|
||||
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
|
||||
Date: Sat, 7 Mar 2020 19:23:40 +0300
|
||||
Subject: [PATCH] objtool/sync-check.sh: set the exit code explicitly
|
||||
|
||||
Commit 6ec14aa7a58a "objtool: Silence build output" removed 'cd -' from
|
||||
the end of sync-check.sh script. As a side-effect, the script now exits
|
||||
with the exit code of the last executed 'check' command. If any of the
|
||||
files it should check are missing (which is not an error per se), it will
|
||||
return 1 and objtool will fail to build.
|
||||
|
||||
Explicit 'exit 0' at the end should fix that.
|
||||
|
||||
Fixes: 6ec14aa7a58a "objtool: Silence build output"
|
||||
Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
|
||||
---
|
||||
tools/objtool/sync-check.sh | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh
|
||||
index 2a1261bfbb62..f23bd02c1b77 100755
|
||||
--- a/tools/objtool/sync-check.sh
|
||||
+++ b/tools/objtool/sync-check.sh
|
||||
@@ -48,3 +48,5 @@ check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[
|
||||
check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"'
|
||||
check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"'
|
||||
check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"'
|
||||
+
|
||||
+exit 0
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
perf: Silence two kinds of format warnings from GCC 8
|
||||
|
||||
perf may be fixed properly in the newer kernel versions but for now, it is
|
||||
easier to just silence -Werror=format-overflow and -Werror=format-truncation.
|
||||
---
|
||||
|
||||
diff -Naur linux-5.9.orig/tools/perf/Makefile.config linux-5.9/tools/perf/Makefile.config
|
||||
--- linux-5.9.orig/tools/perf/Makefile.config 2020-10-17 11:55:52.631117295 +0300
|
||||
+++ linux-5.9/tools/perf/Makefile.config 2020-10-17 11:55:54.391117325 +0300
|
||||
@@ -269,6 +269,7 @@
|
||||
CORE_CFLAGS += -Wall
|
||||
CORE_CFLAGS += -Wextra
|
||||
CORE_CFLAGS += -std=gnu99
|
||||
+CORE_CFLAGS += -Wno-format-truncation -Wno-format-overflow
|
||||
|
||||
CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti
|
||||
CXXFLAGS += -Wall
|
||||
Loading…
Add table
Reference in a new issue