Djam/kernel-6.6
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-6.6.git synced 2025-02-25 20:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the 'mrproper' patch for 4.3.x

Browse source
This commit is contained in:
Evgenii Shatokhin 2015-12-27 16:57:51 +03:00
parent 22faf98a4f
commit 9c7799e33e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
View file

@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 6bb5283..612308f 100644 index 2070d16..ec4f15f 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),) @@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),)
@ -13,7 +13,7 @@ index 6bb5283..612308f 100644
# Objects we will link into vmlinux / subdirs we need to visit # Objects we will link into vmlinux / subdirs we need to visit
init-y := init/ init-y := init/
@@ -992,7 +990,7 @@ prepare0: archprepare FORCE @@ -984,7 +982,7 @@ prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=. $(Q)$(MAKE) $(build)=.
# All the preparing.. # All the preparing..
@ -22,7 +22,7 @@ index 6bb5283..612308f 100644
# Generate some files # Generate some files
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -1174,13 +1172,8 @@ endif # CONFIG_MODULES @@ -1166,13 +1164,8 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR) CLEAN_DIRS += $(MODVERDIR)
# Directories & files removed with 'make mrproper' # Directories & files removed with 'make mrproper'
@ -30,15 +30,15 @@ index 6bb5283..612308f 100644
- arch/*/include/generated .tmp_objdiff - arch/*/include/generated .tmp_objdiff
-MRPROPER_FILES += .config .config.old .version .old_version \ -MRPROPER_FILES += .config .config.old .version .old_version \
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
- signing_key.priv signing_key.x509 x509.genkey \ - signing_key.pem signing_key.priv signing_key.x509 \
- extra_certificates signing_key.x509.keyid \ - x509.genkey extra_certificates signing_key.x509.keyid \
- signing_key.x509.signer vmlinux-gdb.py - signing_key.x509.signer vmlinux-gdb.py
+MRPROPER_DIRS += "" +MRPROPER_DIRS += ""
+MRPROPER_FILES += "" +MRPROPER_FILES += ""
# clean - Delete most, but leave enough to build external modules # clean - Delete most, but leave enough to build external modules
# #
@@ -1201,7 +1194,7 @@ clean: archclean vmlinuxclean @@ -1193,7 +1186,7 @@ clean: archclean vmlinuxclean
# #
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
@ -48,7 +48,7 @@ index 6bb5283..612308f 100644
PHONY += $(mrproper-dirs) mrproper archmrproper PHONY += $(mrproper-dirs) mrproper archmrproper
$(mrproper-dirs): $(mrproper-dirs):
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ece8a70..cda1f92 100644 index aceaaed..8b77f12 100644
--- a/scripts/kconfig/Makefile --- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile
@@ -19,23 +19,16 @@ endif @@ -19,23 +19,16 @@ endif