mirror of
https://abf.rosa.ru/djam/kernel-6.7-xanmod.git
synced 2025-02-25 01:52:49 +00:00
847ae8701e
AUFS was updated to "4.20.4+-20190211" in the process. As for the sorted entries in the config files - this helps a lot during rebases to the newer stable kernel branches. Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
120 lines
3.7 KiB
Diff
120 lines
3.7 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 6f7a8172de44..956a5a3e8d2f 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1069,8 +1069,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE
|
|
# Carefully list dependencies so we do not try to build scripts twice
|
|
# in parallel
|
|
PHONY += scripts
|
|
-scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)
|
|
- $(Q)$(MAKE) $(build)=$(@)
|
|
+scripts:
|
|
|
|
# Things we need to do before we recursively start building the kernel
|
|
# or the modules are listed in "prepare".
|
|
@@ -1107,7 +1106,7 @@ prepare0: archprepare gcc-plugins
|
|
$(Q)$(MAKE) $(build)=.
|
|
|
|
# All the preparing..
|
|
-prepare: prepare0 prepare-objtool
|
|
+prepare:
|
|
|
|
# Support for using generic headers in asm-generic
|
|
PHONY += asm-generic uapi-asm-generic
|
|
@@ -1339,13 +1338,8 @@ endif # CONFIG_MODULES
|
|
CLEAN_DIRS += $(MODVERDIR) include/ksym
|
|
|
|
# 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 \
|
|
- 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
|
|
#
|
|
@@ -1367,13 +1361,10 @@ clean: archclean vmlinuxclean
|
|
#
|
|
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
|
-mrproper-dirs := $(addprefix _mrproper_,scripts)
|
|
|
|
-PHONY += $(mrproper-dirs) mrproper archmrproper
|
|
-$(mrproper-dirs):
|
|
- $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
|
|
+PHONY += mrproper archmrproper
|
|
|
|
-mrproper: clean archmrproper $(mrproper-dirs)
|
|
+mrproper: clean archmrproper
|
|
$(call cmd,rmdirs)
|
|
$(call cmd,rmfiles)
|
|
|
|
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
|
index 63b609243d03..c54eca94ac2c 100644
|
|
--- a/scripts/kconfig/Makefile
|
|
+++ b/scripts/kconfig/Makefile
|
|
@@ -20,19 +20,14 @@ 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)
|
|
|
|
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
|
|
|
|
@@ -66,28 +59,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
|
PHONY += $(simple-targets)
|
|
|
|
$(simple-targets): $(obj)/conf
|
|
- $< $(silent) --$@ $(Kconfig)
|
|
|
|
PHONY += savedefconfig defconfig
|
|
|
|
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/$@)
|
|
|