kernel-5.15/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
Eugene Shatokhin a6f5689f8f Updated to version 3.14.10
The relevant parts of the .spec and other files have been synced to what
Nicolo' Costanza <abitrules@yahoo.it> has prepared.
2014-07-11 16:00:31 +04:00

123 lines
4.4 KiB
Diff

Makefile | 24 ++++++++++++------------
scripts/kconfig/Makefile | 19 -------------------
2 files changed, 12 insertions(+), 31 deletions(-)
diff -Nurp linux-3.14.2-1.mga4/Makefile linux-3.14.2-1.mga4.mrproper/Makefile
--- linux-3.14.2-1.mga4/Makefile 2014-04-26 18:57:12.134824274 +0300
+++ linux-3.14.2-1.mga4.mrproper/Makefile 2014-04-26 18:58:36.410828557 +0300
@@ -522,9 +522,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
- $(Q)$(MAKE) $(build)=$(@)
+scripts:
# Objects we will link into vmlinux / subdirs we need to visit
init-y := init/
@@ -884,7 +882,7 @@ prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
# All the preparing..
-prepare: prepare0
+prepare:
# Generate some files
# ---------------------------------------------------------------------------
@@ -1066,13 +1064,15 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR)
# Directories & files removed with 'make mrproper'
-MRPROPER_DIRS += include/config usr/include include/generated \
- arch/*/include/generated
-MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
- 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
+#MRPROPER_DIRS += include/config usr/include include/generated \
+# arch/*/include/generated
+#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+# 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
+MRPROPER_DIRS += ""
+MRPROPER_FILES += ""
# clean - Delete most, but leave enough to build external modules
#
@@ -1093,7 +1093,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 -Nurp linux-3.14.2-1.mga4/scripts/kconfig/Makefile linux-3.14.2-1.mga4.mrproper/scripts/kconfig/Makefile
--- linux-3.14.2-1.mga4/scripts/kconfig/Makefile 2014-04-26 18:57:12.134824274 +0300
+++ linux-3.14.2-1.mga4.mrproper/scripts/kconfig/Makefile 2014-04-26 18:58:36.411828571 +0300
@@ -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/generated
- $< --$@ $(Kconfig)
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
$(Q)mkdir -p include/generated
@@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj
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)
# Help text used by make help
help: