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

121 lines
4.1 KiB
Diff
Raw Normal View History

diff --git a/Makefile b/Makefile
index fbd43bf..48c61ca 100644
--- a/Makefile
+++ b/Makefile
@@ -552,9 +552,7 @@ ifeq ($(KBUILD_EXTMOD),)
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 \
- asm-generic
- $(Q)$(MAKE) $(build)=$(@)
+scripts:
# Objects we will link into vmlinux / subdirs we need to visit
init-y := init/
@@ -990,7 +988,7 @@ prepare0: archprepare FORCE
2013-11-16 00:27:01 +04:00
$(Q)$(MAKE) $(build)=.
# All the preparing..
-prepare: prepare0
+prepare:
# Generate some files
# ---------------------------------------------------------------------------
@@ -1178,13 +1176,15 @@ endif # CONFIG_MODULES
2013-11-16 00:27:01 +04:00
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 \
2013-11-16 00:27:01 +04:00
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
- 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 += include/config usr/include include/generated \
+# arch/*/include/generated .tmp_objdiff
+#MRPROPER_FILES += .config .config.old .version .old_version \
2013-11-16 00:27:01 +04:00
+# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+# 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
#
@@ -1205,7 +1205,7 @@ clean: archclean vmlinuxclean
2013-11-16 00:27:01 +04:00
#
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 9645c07..9d147f9 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
2013-11-16 00:27:01 +04:00
@@ -15,26 +15,18 @@ endif
unexport CONFIG_
xconfig: $(obj)/qconf 3rdparty/Makefile
- $< $(Kconfig)
gconfig: $(obj)/gconf 3rdparty/Makefile
- $< $(Kconfig)
menuconfig: $(obj)/mconf 3rdparty/Makefile
- $< $(Kconfig)
config: $(obj)/conf 3rdparty/Makefile
- $< --oldaskconfig $(Kconfig)
nconfig: $(obj)/nconf 3rdparty/Makefile
- $< $(Kconfig)
oldconfig: $(obj)/conf 3rdparty/Makefile
- $< --$@ $(Kconfig)
silentoldconfig: $(obj)/conf 3rdparty/Makefile
- $(Q)mkdir -p include/config include/generated
2013-11-16 00:27:01 +04:00
- $< --$@ $(Kconfig)
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
$(Q)mkdir -p include/config include/generated
@@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
2013-11-16 00:27:01 +04:00
PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
- $< --$@ $(Kconfig)
PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
- $< --$@ $(Kconfig)
# oldnoconfig is an alias of olddefconfig, because people already are dependent
# on its behavior(sets new symbols to their default value but not 'n') with the
# counter-intuitive name.
oldnoconfig: $(obj)/conf 3rdparty/Makefile
- $< --olddefconfig $(Kconfig)
savedefconfig: $(obj)/conf 3rdparty/Makefile
- $< --$@=defconfig $(Kconfig)
defconfig: $(obj)/conf 3rdparty/Makefile
-ifeq ($(KBUILD_DEFCONFIG),)
- $< --defconfig $(Kconfig)
-else
- @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
-endif
%_defconfig: $(obj)/conf 3rdparty/Makefile
- $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)