mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
0260460708
Besides the upstream kernel update to 4.8.x, the following changes were made: * BFQ was updated to v8r4 * AUFS was updated to version 4.8-20161010
109 lines
3.4 KiB
Diff
109 lines
3.4 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 5a493e7..2055c07 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
|
|
-scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
|
|
- asm-generic gcc-plugins
|
|
- $(Q)$(MAKE) $(build)=$(@)
|
|
+scripts:
|
|
|
|
# Objects we will link into vmlinux / subdirs we need to visit
|
|
init-y := init/
|
|
@@ -986,7 +984,7 @@ prepare0: archprepare FORCE
|
|
$(Q)$(MAKE) $(build)=.
|
|
|
|
# All the preparing..
|
|
-prepare: prepare0 prepare-objtool
|
|
+prepare:
|
|
|
|
ifdef CONFIG_STACK_VALIDATION
|
|
has_libelf := $(call try-run,\
|
|
@@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES
|
|
CLEAN_DIRS += $(MODVERDIR)
|
|
|
|
# Directories & files removed with 'make mrproper'
|
|
-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.pem 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
|
|
#
|
|
@@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean
|
|
#
|
|
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
|
-mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts)
|
|
+mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook)
|
|
|
|
PHONY += $(mrproper-dirs) mrproper archmrproper
|
|
$(mrproper-dirs):
|
|
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
|
index ebced77..7f51efa 100644
|
|
--- a/scripts/kconfig/Makefile
|
|
+++ b/scripts/kconfig/Makefile
|
|
@@ -19,23 +19,16 @@ endif
|
|
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)
|
|
|
|
silentoldconfig: $(obj)/conf
|
|
- $(Q)mkdir -p include/config include/generated
|
|
- $< $(silent) --$@ $(Kconfig)
|
|
|
|
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
|
|
$(Q)mkdir -p include/config include/generated
|
|
@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
|
PHONY += $(simple-targets)
|
|
|
|
$(simple-targets): $(obj)/conf
|
|
- $< $(silent) --$@ $(Kconfig)
|
|
|
|
PHONY += oldnoconfig savedefconfig defconfig
|
|
|
|
@@ -91,23 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
|
|
oldnoconfig: olddefconfig
|
|
|
|
savedefconfig: $(obj)/conf
|
|
- $< $(silent) --$@=defconfig $(Kconfig)
|
|
|
|
defconfig: $(obj)/conf
|
|
-ifeq ($(KBUILD_DEFCONFIG),)
|
|
- $< $(silent) --defconfig $(Kconfig)
|
|
-else
|
|
-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
|
|
-endif
|
|
|
|
%_defconfig: $(obj)/conf
|
|
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
|
|
|
|
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
|
|
|