kernel-5.15/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch

119 lines
3.8 KiB
Diff
Raw Normal View History

diff --git a/Makefile b/Makefile
2018-07-05 21:40:11 +03:00
index 1d740dbe676d..99d04dea3e2d 100644
--- a/Makefile
+++ b/Makefile
2018-07-05 21:40:11 +03:00
@@ -1074,9 +1074,7 @@ include/config/kernel.release: include/config/auto.conf FORCE
2013-11-16 00:27:01 +04:00
# 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 \
2018-07-05 21:40:11 +03:00
- asm-generic gcc-plugins $(autoksyms_h)
2013-11-16 00:27:01 +04:00
- $(Q)$(MAKE) $(build)=$(@)
+scripts:
2018-07-05 21:40:11 +03:00
# Things we need to do before we recursively start building the kernel
# or the modules are listed in "prepare".
@@ -1115,7 +1113,7 @@ prepare0: archprepare gcc-plugins
2013-11-16 00:27:01 +04:00
$(Q)$(MAKE) $(build)=.
# All the preparing..
-prepare: prepare0 prepare-objtool
2013-11-16 00:27:01 +04:00
+prepare:
# Support for using generic headers in asm-generic
PHONY += asm-generic uapi-asm-generic
2018-07-05 21:40:11 +03:00
@@ -1347,13 +1345,8 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR) include/ksym
2013-11-16 00:27:01 +04:00
# 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 \
2013-11-16 00:27:01 +04:00
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
2015-12-27 16:57:51 +03:00
- signing_key.pem signing_key.priv signing_key.x509 \
- x509.genkey extra_certificates signing_key.x509.keyid \
- signing_key.x509.signer vmlinux-gdb.py
2013-11-16 00:27:01 +04:00
+MRPROPER_DIRS += ""
+MRPROPER_FILES += ""
# clean - Delete most, but leave enough to build external modules
#
2018-07-05 21:40:11 +03:00
@@ -1375,13 +1368,10 @@ clean: archclean vmlinuxclean
2013-11-16 00:27:01 +04:00
#
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
2017-09-11 18:31:26 +03:00
-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)
2013-11-16 00:27:01 +04:00
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
2018-07-05 21:40:11 +03:00
index 5def8779d7d8..9de582ed13f6 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
2018-07-05 21:40:11 +03:00
@@ -20,25 +20,18 @@ endif
2013-11-16 00:27:01 +04:00
unexport CONFIG_
xconfig: $(obj)/qconf
- $< $(silent) $(Kconfig)
2013-11-16 00:27:01 +04:00
gconfig: $(obj)/gconf
- $< $(silent) $(Kconfig)
2013-11-16 00:27:01 +04:00
menuconfig: $(obj)/mconf
- $< $(silent) $(Kconfig)
2013-11-16 00:27:01 +04:00
config: $(obj)/conf
- $< $(silent) --oldaskconfig $(Kconfig)
2013-11-16 00:27:01 +04:00
nconfig: $(obj)/nconf
- $< $(silent) $(Kconfig)
2013-11-16 00:27:01 +04:00
2018-04-22 12:50:55 +03:00
# This has become an internal implementation detail and is now deprecated
# for external use.
2018-07-05 21:40:11 +03:00
syncconfig: $(obj)/conf
- $(Q)mkdir -p include/config include/generated
- $< $(silent) --$@ $(Kconfig)
2013-11-16 00:27:01 +04:00
2018-07-05 21:40:11 +03:00
localyesconfig localmodconfig: $(obj)/conf
$(Q)mkdir -p include/config include/generated
2018-07-05 21:40:11 +03:00
@@ -84,7 +77,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
PHONY += $(simple-targets)
2013-11-16 00:27:01 +04:00
$(simple-targets): $(obj)/conf
- $< $(silent) --$@ $(Kconfig)
2013-11-16 00:27:01 +04:00
2018-07-05 21:40:11 +03:00
PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
2013-11-16 00:27:01 +04:00
2018-07-05 21:40:11 +03:00
@@ -103,23 +95,10 @@ silentoldconfig: syncconfig
@echo " \"silentoldconfig\" will be removed after Linux 4.19"
2013-11-16 00:27:01 +04:00
savedefconfig: $(obj)/conf
- $< $(silent) --$@=defconfig $(Kconfig)
2013-11-16 00:27:01 +04:00
defconfig: $(obj)/conf
2013-11-16 00:27:01 +04:00
-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)
2016-02-02 18:07:44 +03:00
-else
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
-endif
2013-11-16 00:27:01 +04:00
-endif
%_defconfig: $(obj)/conf
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
2013-11-16 00:27:01 +04:00
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)