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

Fixed the 'mrproper' patch for 4.4.x

Browse source
This commit is contained in:
Evgenii Shatokhin 2016-02-02 18:07:44 +03:00
parent bc9d8c7ecd
commit 9fda153220
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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 2070d16..ec4f15f 100644 index c6a265b..b52baa9 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 2070d16..ec4f15f 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/
@@ -984,7 +982,7 @@ prepare0: archprepare FORCE @@ -986,7 +984,7 @@ prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=. $(Q)$(MAKE) $(build)=.
# All the preparing.. # All the preparing..
@ -22,7 +22,7 @@ index 2070d16..ec4f15f 100644
# Generate some files # Generate some files
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -1166,13 +1164,8 @@ endif # CONFIG_MODULES @@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR) CLEAN_DIRS += $(MODVERDIR)
# Directories & files removed with 'make mrproper' # Directories & files removed with 'make mrproper'
@ -38,7 +38,7 @@ index 2070d16..ec4f15f 100644
# clean - Delete most, but leave enough to build external modules # clean - Delete most, but leave enough to build external modules
# #
@@ -1193,7 +1186,7 @@ clean: archclean vmlinuxclean @@ -1198,7 +1191,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 2070d16..ec4f15f 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 aceaaed..8b77f12 100644 index d79cba4..7f51efa 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
@ -83,7 +83,7 @@ index aceaaed..8b77f12 100644
PHONY += oldnoconfig savedefconfig defconfig PHONY += oldnoconfig savedefconfig defconfig
@@ -91,18 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig @@ -91,21 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
oldnoconfig: olddefconfig oldnoconfig: olddefconfig
savedefconfig: $(obj)/conf savedefconfig: $(obj)/conf
@ -92,9 +92,12 @@ index aceaaed..8b77f12 100644
defconfig: $(obj)/conf defconfig: $(obj)/conf
-ifeq ($(KBUILD_DEFCONFIG),) -ifeq ($(KBUILD_DEFCONFIG),)
- $< $(silent) --defconfig $(Kconfig) - $< $(silent) --defconfig $(Kconfig)
-else -else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
-else
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
-endif -endif
%_defconfig: $(obj)/conf %_defconfig: $(obj)/conf