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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 435269 - (show annotations) (download)
Sun Jun 2 18:58:28 2013 UTC (10 years, 9 months ago) by tmb
File size: 4304 byte(s)
- update to 3.9.4
- drop merged patches:
  * DI01, DI10-DI12, DI20-DI22, DI30-DI31, DI40-DI41
  *  DI50-DI64, DI70-DI75, DM10, DN10-DN14, DS10
- update patches:
  * CK01: -ck1 patchset including BFS 0.430
  * FR01: Reiser4 support for kernel 3.9
+  * KP01: TuxOnIce 3.3 for kernel 3.9
- rediff patches:
  * FO01, FO04: overlayfs support
  * MB02: 3rdparty tree merge
- add patches:
  * DN04: fix up alx AR8161 breakage (mga #10079)
  * MB13: ndiswrapper buildfix for kernel 3.9
- update filelists
- update defconfigs


1 diff -Nurp linux-3.9.4-mga0.8/Makefile linux-3.9.4-mga0.8-mrp/Makefile
2 --- linux-3.9.4-mga0.8/Makefile 2013-06-02 14:37:28.025017241 +0300
3 +++ linux-3.9.4-mga0.8-mrp/Makefile 2013-06-02 14:38:36.759598104 +0300
4 @@ -513,9 +513,7 @@ ifeq ($(KBUILD_EXTMOD),)
5 # Carefully list dependencies so we do not try to build scripts twice
6 # in parallel
7 PHONY += scripts
8 -scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
9 - asm-generic
10 - $(Q)$(MAKE) $(build)=$(@)
11 +scripts:
12
13 # Objects we will link into vmlinux / subdirs we need to visit
14 init-y := init/
15 @@ -833,7 +831,7 @@ prepare0: archprepare FORCE
16 $(Q)$(MAKE) $(build)=.
17
18 # All the preparing..
19 -prepare: prepare0
20 +prepare:
21
22 # Generate some files
23 # ---------------------------------------------------------------------------
24 @@ -1015,13 +1013,15 @@ endif # CONFIG_MODULES
25 CLEAN_DIRS += $(MODVERDIR)
26
27 # Directories & files removed with 'make mrproper'
28 -MRPROPER_DIRS += include/config usr/include include/generated \
29 - arch/*/include/generated
30 -MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
31 - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
32 - signing_key.priv signing_key.x509 x509.genkey \
33 - extra_certificates signing_key.x509.keyid \
34 - signing_key.x509.signer
35 +#MRPROPER_DIRS += include/config usr/include include/generated \
36 +# arch/*/include/generated
37 +#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
38 +# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
39 +# signing_key.priv signing_key.x509 x509.genkey \
40 +# extra_certificates signing_key.x509.keyid \
41 +# signing_key.x509.signer
42 +MRPROPER_DIRS += ""
43 +MRPROPER_FILES += ""
44
45 # clean - Delete most, but leave enough to build external modules
46 #
47 @@ -1042,7 +1042,7 @@ clean: archclean vmlinuxclean
48 #
49 mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
50 mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
51 -mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts)
52 +mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook)
53
54 PHONY += $(mrproper-dirs) mrproper archmrproper
55 $(mrproper-dirs):
56 diff -Nurp linux-3.9.4-mga0.8/scripts/kconfig/Makefile linux-3.9.4-mga0.8-mrp/scripts/kconfig/Makefile
57 --- linux-3.9.4-mga0.8/scripts/kconfig/Makefile 2013-06-02 14:37:28.025017241 +0300
58 +++ linux-3.9.4-mga0.8-mrp/scripts/kconfig/Makefile 2013-06-02 14:38:08.917362838 +0300
59 @@ -15,26 +15,18 @@ endif
60 unexport CONFIG_
61
62 xconfig: $(obj)/qconf 3rdparty/Makefile
63 - $< $(Kconfig)
64
65 gconfig: $(obj)/gconf 3rdparty/Makefile
66 - $< $(Kconfig)
67
68 menuconfig: $(obj)/mconf 3rdparty/Makefile
69 - $< $(Kconfig)
70
71 config: $(obj)/conf 3rdparty/Makefile
72 - $< --oldaskconfig $(Kconfig)
73
74 nconfig: $(obj)/nconf 3rdparty/Makefile
75 - $< $(Kconfig)
76
77 oldconfig: $(obj)/conf 3rdparty/Makefile
78 - $< --$@ $(Kconfig)
79
80 silentoldconfig: $(obj)/conf 3rdparty/Makefile
81 - $(Q)mkdir -p include/generated
82 - $< --$@ $(Kconfig)
83
84 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
85 $(Q)mkdir -p include/generated
86 @@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj
87 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
88
89 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
90 - $< --$@ $(Kconfig)
91
92 PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
93
94 listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
95 - $< --$@ $(Kconfig)
96
97 # oldnoconfig is an alias of olddefconfig, because people already are dependent
98 # on its behavior(sets new symbols to their default value but not 'n') with the
99 # counter-intuitive name.
100 oldnoconfig: $(obj)/conf 3rdparty/Makefile
101 - $< --olddefconfig $(Kconfig)
102
103 savedefconfig: $(obj)/conf 3rdparty/Makefile
104 - $< --$@=defconfig $(Kconfig)
105
106 defconfig: $(obj)/conf 3rdparty/Makefile
107 -ifeq ($(KBUILD_DEFCONFIG),)
108 - $< --defconfig $(Kconfig)
109 -else
110 - @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
111 - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
112 -endif
113
114 %_defconfig: $(obj)/conf 3rdparty/Makefile
115 - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
116
117 # Help text used by make help
118 help:

  ViewVC Help
Powered by ViewVC 1.1.30