/[packages]/updates/5/kernel-tmb/current/SOURCES/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
ViewVC logotype

Annotation of /updates/5/kernel-tmb/current/SOURCES/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch

Parent Directory Parent Directory | Revision Log Revision Log


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

  ViewVC Help
Powered by ViewVC 1.1.26