mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
5488a28d4b
- rediffed most of patches, renamed files to easify further rediffs by git format-patch - thanks to abf.io/kernels_stable for some patches for kernel 5.9 - using unofficial patch for AUFS for kernel 5.10, there may be issues with stability, try to avoid using AUFS (I would have dropped it, but MagOS wants it very much) - pulled updates of AltHa from http://git.altlinux.org/gears/k/kernel-image-un-def.git?p=kernel-image-un-def.git;a=history;f=security/altha;hb=HEAD - dropped patch adding sysctl to disable disk-based swap because it has not found any usage - bpf is now in the list of LSM modules (ability to write LSM modules as BPF programs), enable it, it is potentially useful and does not seem to be harmful - keeping kernel libc headers in older kernels for now - dropped building external virtualbox guest modules because they are now included into the mainline kernel - offed building VirtualBox host modules, I do not know how to keep these binary modules in sync with userspace part of VirtualBox, users can continue using dkms - offed building kernel-shredder because it is not buildable on kernel 5.10 - updated rtl8821ce and added a dependency from its "blacklist" subpackage here (see https://github.com/tomaspinho/rtl8821ce/commit/14b536f0) It is not clear if kernel 5.10 will receive an LTS support longer than 5.4 or not. Support until Dec, 2022 is declared right now at https://www.kernel.org/category/releases.html for 5.10 and until Dec, 2025 - for 5.4. TODO: update kernel configs TODO: solve problems with version of virtualbox host modules not matching version of the virtualbox package after virtualbox is updated but kernel is not rebuilt
134 lines
4.2 KiB
Diff
134 lines
4.2 KiB
Diff
From 1a821310ed4c0519e7fe534ea0a4ba46e604ee4f Mon Sep 17 00:00:00 2001
|
|
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
|
|
Date: Wed, 11 Dec 2019 21:15:36 +0300
|
|
Subject: [PATCH] disable mrproper prepare scripts configs in devel rpms
|
|
|
|
This is for disabling *config, mrproper, prepare, scripts on -devel rpms
|
|
Needed, because otherwise the -devel won't build correctly.
|
|
|
|
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
---
|
|
Makefile | 22 +++++-----------------
|
|
scripts/kconfig/Makefile | 17 -----------------
|
|
2 files changed, 5 insertions(+), 34 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 076d4e6b9ccc..75bf27049d60 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1186,8 +1186,7 @@ include/config/kernel.release: FORCE
|
|
# 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".
|
|
@@ -1206,7 +1205,7 @@ prepare0: archprepare
|
|
$(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
|
|
@@ -1472,15 +1471,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers \
|
|
compile_commands.json
|
|
|
|
# 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_FILES += ""
|
|
|
|
# Directories & files removed with 'make distclean'
|
|
DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
|
|
@@ -1500,13 +1491,10 @@ clean: archclean vmlinuxclean
|
|
# 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 --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
|
index e46df0a2d4f9..edceb8d1d213 100644
|
|
--- a/scripts/kconfig/Makefile
|
|
+++ b/scripts/kconfig/Makefile
|
|
@@ -20,19 +20,14 @@ endif
|
|
unexport CONFIG_
|
|
|
|
xconfig: $(obj)/qconf
|
|
- $(Q)$< $(silent) $(Kconfig)
|
|
|
|
gconfig: $(obj)/gconf
|
|
- $(Q)$< $(silent) $(Kconfig)
|
|
|
|
menuconfig: $(obj)/mconf
|
|
- $(Q)$< $(silent) $(Kconfig)
|
|
|
|
config: $(obj)/conf
|
|
- $(Q)$< $(silent) --oldaskconfig $(Kconfig)
|
|
|
|
nconfig: $(obj)/nconf
|
|
- $(Q)$< $(silent) $(Kconfig)
|
|
|
|
build_menuconfig: $(obj)/mconf
|
|
|
|
@@ -48,11 +43,9 @@ localyesconfig localmodconfig: $(obj)/conf
|
|
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 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
|
PHONY += $(simple-targets)
|
|
|
|
$(simple-targets): $(obj)/conf
|
|
- $(Q)$< $(silent) --$@ $(Kconfig)
|
|
|
|
PHONY += savedefconfig defconfig
|
|
|
|
savedefconfig: $(obj)/conf
|
|
- $(Q)$< $(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/$@)
|
|
|
|
--
|
|
2.25.1
|
|
|