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

Annotation of /cauldron/kernel-tmb/pristine/SOURCES/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 467214 - (hide annotations) (download)
Sat Aug 17 11:34:02 2013 UTC (10 years, 8 months ago) by tmb
Original Path: cauldron/kernel-tmb/current/SOURCES/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
File size: 4461 byte(s)
- update to 3.10.7
- drop merged/obsolete patches:
  * AA01-AA17: stable queue fixes
  * DN01-DN04: alx backport
  * DN22: carl9170 fix
- update patches:
  * CK01: -ck patchset including BFS 0.440
  * FO01-FO09: overlayfs support
  * FR01: Reiser4 support
  * KP01: TuxOnIce support
- add patches:
  * MB14: ndiswrapper kernel 3.10 buildfix
- add support for extended stable builds
- update requires on firmwares and tools
- add conflicts on too old dkms, firmware and
  tools to get better upgrade transactions
- update defconfigs
- update filelists


1 tmb 467214
2     Makefile | 24 ++++++++++++------------
3     scripts/kconfig/Makefile | 19 -------------------
4     2 files changed, 12 insertions(+), 31 deletions(-)
5    
6     diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile
7     --- linux-3.10.1-mga1/Makefile 2013-07-14 19:13:58.126152807 +0300
8     +++ linux-3.10.1-mga1.mrp/Makefile 2013-07-14 19:16:14.385315249 +0300
9 tmb 435269 @@ -513,9 +513,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 467214 @@ -835,7 +833,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 467214 @@ -1017,13 +1015,15 @@ 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     - arch/*/include/generated
35 tmb 408960 -MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
36     - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
37     - signing_key.priv signing_key.x509 x509.genkey \
38     - extra_certificates signing_key.x509.keyid \
39     - signing_key.x509.signer
40 tmb 134369 +#MRPROPER_DIRS += include/config usr/include include/generated \
41     +# arch/*/include/generated
42 tmb 408960 +#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
43     +# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
44     +# signing_key.priv signing_key.x509 x509.genkey \
45     +# extra_certificates signing_key.x509.keyid \
46     +# signing_key.x509.signer
47 tmb 134369 +MRPROPER_DIRS += ""
48     +MRPROPER_FILES += ""
49 tmb 78708
50     # clean - Delete most, but leave enough to build external modules
51     #
52 tmb 467214 @@ -1044,7 +1044,7 @@ clean: archclean vmlinuxclean
53 tmb 78708 #
54     mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
55     mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
56     -mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts)
57     +mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook)
58    
59     PHONY += $(mrproper-dirs) mrproper archmrproper
60     $(mrproper-dirs):
61 tmb 467214 diff -Nurp linux-3.10.1-mga1/scripts/kconfig/Makefile linux-3.10.1-mga1.mrp/scripts/kconfig/Makefile
62     --- linux-3.10.1-mga1/scripts/kconfig/Makefile 2013-07-14 19:13:58.126152807 +0300
63     +++ linux-3.10.1-mga1.mrp/scripts/kconfig/Makefile 2013-07-14 19:16:14.386315260 +0300
64 tmb 435269 @@ -15,26 +15,18 @@ endif
65     unexport CONFIG_
66 tmb 61100
67     xconfig: $(obj)/qconf 3rdparty/Makefile
68     - $< $(Kconfig)
69    
70     gconfig: $(obj)/gconf 3rdparty/Makefile
71     - $< $(Kconfig)
72    
73     menuconfig: $(obj)/mconf 3rdparty/Makefile
74     - $< $(Kconfig)
75    
76     config: $(obj)/conf 3rdparty/Makefile
77     - $< --oldaskconfig $(Kconfig)
78    
79     nconfig: $(obj)/nconf 3rdparty/Makefile
80     - $< $(Kconfig)
81    
82     oldconfig: $(obj)/conf 3rdparty/Makefile
83     - $< --$@ $(Kconfig)
84    
85     silentoldconfig: $(obj)/conf 3rdparty/Makefile
86     - $(Q)mkdir -p include/generated
87     - $< --$@ $(Kconfig)
88    
89 tmb 191904 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
90     $(Q)mkdir -p include/generated
91 tmb 435269 @@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj
92 tmb 61100 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
93    
94     allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
95     - $< --$@ $(Kconfig)
96    
97 tmb 408960 PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
98 tmb 61100
99 tmb 408960 listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
100 tmb 61100 - $< --$@ $(Kconfig)
101    
102 tmb 408960 # oldnoconfig is an alias of olddefconfig, because people already are dependent
103     # on its behavior(sets new symbols to their default value but not 'n') with the
104     # counter-intuitive name.
105     oldnoconfig: $(obj)/conf 3rdparty/Makefile
106     - $< --olddefconfig $(Kconfig)
107    
108 tmb 61100 savedefconfig: $(obj)/conf 3rdparty/Makefile
109     - $< --$@=defconfig $(Kconfig)
110    
111     defconfig: $(obj)/conf 3rdparty/Makefile
112     -ifeq ($(KBUILD_DEFCONFIG),)
113     - $< --defconfig $(Kconfig)
114     -else
115     - @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
116     - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
117     -endif
118    
119     %_defconfig: $(obj)/conf 3rdparty/Makefile
120     - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
121    
122     # Help text used by make help
123     help:

  ViewVC Help
Powered by ViewVC 1.1.30