| 1 |
|
| 2 |
Makefile | 17 +++++------------ |
| 3 |
scripts/kconfig/Makefile | 23 ----------------------- |
| 4 |
2 files changed, 5 insertions(+), 35 deletions(-) |
| 5 |
|
| 6 |
diff -Nurp linux-4.4.7-mga1/Makefile linux-4.4.7-mga1-mrproper/Makefile |
| 7 |
--- linux-4.4.7-mga1/Makefile 2016-04-12 19:49:25.607028071 +0300 |
| 8 |
+++ linux-4.4.7-mga1-mrproper/Makefile 2016-04-12 19:50:54.027047346 +0300 |
| 9 |
@@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),) |
| 10 |
# Carefully list dependencies so we do not try to build scripts twice |
| 11 |
# in parallel |
| 12 |
PHONY += scripts |
| 13 |
-scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \ |
| 14 |
- asm-generic |
| 15 |
- $(Q)$(MAKE) $(build)=$(@) |
| 16 |
+scripts: |
| 17 |
|
| 18 |
# Objects we will link into vmlinux / subdirs we need to visit |
| 19 |
init-y := init/ |
| 20 |
@@ -986,7 +984,7 @@ prepare0: archprepare FORCE |
| 21 |
$(Q)$(MAKE) $(build)=. |
| 22 |
|
| 23 |
# All the preparing.. |
| 24 |
-prepare: prepare0 |
| 25 |
+prepare: |
| 26 |
|
| 27 |
# Generate some files |
| 28 |
# --------------------------------------------------------------------------- |
| 29 |
@@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES |
| 30 |
CLEAN_DIRS += $(MODVERDIR) |
| 31 |
|
| 32 |
# Directories & files removed with 'make mrproper' |
| 33 |
-MRPROPER_DIRS += include/config usr/include include/generated \ |
| 34 |
- arch/*/include/generated .tmp_objdiff |
| 35 |
-MRPROPER_FILES += .config .config.old .version .old_version \ |
| 36 |
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ |
| 37 |
- signing_key.pem signing_key.priv signing_key.x509 \ |
| 38 |
- x509.genkey extra_certificates signing_key.x509.keyid \ |
| 39 |
- signing_key.x509.signer vmlinux-gdb.py |
| 40 |
+MRPROPER_DIRS += "" |
| 41 |
+MRPROPER_FILES += "" |
| 42 |
|
| 43 |
# clean - Delete most, but leave enough to build external modules |
| 44 |
# |
| 45 |
@@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean |
| 46 |
# |
| 47 |
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) |
| 48 |
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) |
| 49 |
-mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts) |
| 50 |
+mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook) |
| 51 |
|
| 52 |
PHONY += $(mrproper-dirs) mrproper archmrproper |
| 53 |
$(mrproper-dirs): |
| 54 |
diff -Nurp linux-4.4.7-mga1/scripts/kconfig/Makefile linux-4.4.7-mga1-mrproper/scripts/kconfig/Makefile |
| 55 |
--- linux-4.4.7-mga1/scripts/kconfig/Makefile 2016-04-12 19:49:25.607028071 +0300 |
| 56 |
+++ linux-4.4.7-mga1-mrproper/scripts/kconfig/Makefile 2016-04-12 19:51:49.180055656 +0300 |
| 57 |
@@ -19,23 +19,16 @@ endif |
| 58 |
unexport CONFIG_ |
| 59 |
|
| 60 |
xconfig: $(obj)/qconf 3rdparty/Makefile |
| 61 |
- $< $(silent) $(Kconfig) |
| 62 |
|
| 63 |
gconfig: $(obj)/gconf 3rdparty/Makefile |
| 64 |
- $< $(silent) $(Kconfig) |
| 65 |
|
| 66 |
menuconfig: $(obj)/mconf 3rdparty/Makefile |
| 67 |
- $< $(silent) $(Kconfig) |
| 68 |
|
| 69 |
config: $(obj)/conf 3rdparty/Makefile |
| 70 |
- $< $(silent) --oldaskconfig $(Kconfig) |
| 71 |
|
| 72 |
nconfig: $(obj)/nconf 3rdparty/Makefile |
| 73 |
- $< $(silent) $(Kconfig) |
| 74 |
|
| 75 |
silentoldconfig: $(obj)/conf 3rdparty/Makefile |
| 76 |
- $(Q)mkdir -p include/config include/generated |
| 77 |
- $< $(silent) --$@ $(Kconfig) |
| 78 |
|
| 79 |
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile |
| 80 |
$(Q)mkdir -p include/config include/generated |
| 81 |
@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig |
| 82 |
PHONY += $(simple-targets) |
| 83 |
|
| 84 |
$(simple-targets): $(obj)/conf 3rdparty/Makefile |
| 85 |
- $< $(silent) --$@ $(Kconfig) |
| 86 |
|
| 87 |
PHONY += oldnoconfig savedefconfig defconfig |
| 88 |
|
| 89 |
@@ -91,23 +83,8 @@ PHONY += oldnoconfig savedefconfig defco |
| 90 |
oldnoconfig: olddefconfig 3rdparty/Makefile |
| 91 |
|
| 92 |
savedefconfig: $(obj)/conf 3rdparty/Makefile |
| 93 |
- $< $(silent) --$@=defconfig $(Kconfig) |
| 94 |
- |
| 95 |
-defconfig: $(obj)/conf 3rdparty/Makefile |
| 96 |
-ifeq ($(KBUILD_DEFCONFIG),) |
| 97 |
- $< $(silent) --defconfig $(Kconfig) |
| 98 |
-else |
| 99 |
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),) |
| 100 |
- @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" |
| 101 |
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) |
| 102 |
-else |
| 103 |
- @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'" |
| 104 |
- $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG) |
| 105 |
-endif |
| 106 |
-endif |
| 107 |
|
| 108 |
%_defconfig: $(obj)/conf 3rdparty/Makefile |
| 109 |
- $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) |
| 110 |
|
| 111 |
configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@) |
| 112 |
|
Parent Directory
| 
Revision Log