Revisited the patch for mrproper, etc., for the kernel 4.4.7

This commit is contained in:
Evgenii Shatokhin 2016-04-15 13:31:35 +03:00
parent 4743610ad0
commit 4d11ec3cd3

View file

@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
index c6a265b..b52baa9 100644
index 5a493e7..2055c07 100644
--- a/Makefile
+++ b/Makefile
@@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),)
@ -48,7 +48,7 @@ index c6a265b..b52baa9 100644
PHONY += $(mrproper-dirs) mrproper archmrproper
$(mrproper-dirs):
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index d79cba4..7f51efa 100644
index ebced77..7f51efa 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -19,23 +19,16 @@ endif
@ -83,7 +83,7 @@ index d79cba4..7f51efa 100644
PHONY += oldnoconfig savedefconfig defconfig
@@ -91,21 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
@@ -91,23 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
oldnoconfig: olddefconfig
savedefconfig: $(obj)/conf
@ -92,12 +92,14 @@ index d79cba4..7f51efa 100644
defconfig: $(obj)/conf
-ifeq ($(KBUILD_DEFCONFIG),)
- $< $(silent) --defconfig $(Kconfig)
-else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
-else
-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)
-else
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
-endif
-endif
%_defconfig: $(obj)/conf