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

118 lines
3.6 KiB
Diff
Raw Normal View History

diff --git a/Makefile b/Makefile
2020-08-13 19:21:49 +03:00
index 7932464518f1..17b8a77dc7bc 100644
--- a/Makefile
+++ b/Makefile
2020-08-13 19:21:49 +03:00
@@ -1155,8 +1155,7 @@ include/config/kernel.release: 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 scripts_dtc
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".
2020-08-13 19:21:49 +03:00
@@ -1175,7 +1174,7 @@ prepare0: archprepare
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
asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
2020-08-13 19:21:49 +03:00
@@ -1434,15 +1433,7 @@ CLEAN_FILES += include/ksym vmlinux.symvers \
modules.builtin modules.builtin.modinfo modules.nsdeps
2013-11-16 00:27:01 +04:00
# Directories & files removed with 'make mrproper'
2020-08-13 19:21:49 +03:00
-MRPROPER_FILES += include/config include/generated \
2019-12-15 15:12:14 +03:00
- arch/$(SRCARCH)/include/generated .tmp_objdiff \
2020-08-13 19:21:49 +03:00
- debian snap tar-install \
- .config .config.old .version \
2019-09-24 11:56:44 +03:00
- Module.symvers \
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 \
2019-12-15 15:12:14 +03:00
- signing_key.x509.signer vmlinux-gdb.py \
- *.spec
2013-11-16 00:27:01 +04:00
+MRPROPER_FILES += ""
2019-09-24 11:56:44 +03:00
# Directories & files removed with 'make distclean'
2020-08-13 19:21:49 +03:00
DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
@@ -1462,13 +1453,10 @@ clean: archclean vmlinuxclean
# mrproper - Delete all generated files, including .config
2013-11-16 00:27:01 +04:00
#
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
2017-09-11 18:31:26 +03:00
-mrproper-dirs := $(addprefix _mrproper_,scripts)
-PHONY += $(mrproper-dirs) mrproper
2017-09-11 18:31:26 +03:00
-$(mrproper-dirs):
- $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
+PHONY += mrproper
2017-09-11 18:31:26 +03:00
-mrproper: clean $(mrproper-dirs)
+mrproper: clean
2017-09-11 18:31:26 +03:00
$(call cmd,rmfiles)
2013-11-16 00:27:01 +04:00
2020-08-13 19:21:49 +03:00
# distclean
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
2020-08-13 19:21:49 +03:00
index 52b59bf9efe4..54cc6a62f229 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
2020-08-13 19:21:49 +03:00
@@ -20,19 +20,14 @@ 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
build_menuconfig: $(obj)/mconf
2020-08-13 19:21:49 +03:00
@@ -48,11 +43,9 @@ localyesconfig localmodconfig: $(obj)/conf
2020-04-11 20:02:04 +03:00
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
2020-08-13 19:21:49 +03:00
@@ -68,24 +61,14 @@ 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
PHONY += savedefconfig defconfig
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
2019-09-24 11:56:44 +03:00
-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)
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/$@)