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

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

Parent Directory Parent Directory | Revision Log Revision Log

Revision 408960 - (show annotations) (download)
Sun Apr 7 19:46:34 2013 UTC (11 years ago) by tmb
Original Path: cauldron/kernel-tmb/current/SOURCES/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
File size: 4445 byte(s) 
- update to 3.8.6
- update patches:
  * CK01: -ck patchset inclunding BFS 0.428
  * DN01-DN02: alx ethernet driver
  * F01-F13: overlayfs
  * KP01: TuxOnIce 3.3
  * MB10: ndiswrapper 1.58
- drop merged/obsolete patches:
  * AA01-AA16: stable queue fixes for 3.6 series
  * CK02: BFS boot fix
  * DM50: DVB-S builfix
  * DM60: rttrack buildfix
  * MB13, MB14: ndiswrapper buildfixes
- add patches:
  * AA01-AA20: 3.8 -stable queue fixes
  * DI01: Intel Wellsburg PCH i2c support
  * DM10: Intel Wellsburg PCH lpc support
  * DN03-DN04: alx buildfixes
  * DN10: net: asix: init ASIX AX88772B MAC from EEPROM
  * DN11: net: asix: handle packets crossing URB boundaries
  * DN12: usb/net/asix_devices: Add USBNET HG20F9 ethernet dongle (coling)
  * DN13: asix cleanup
  * DN14: net: ax88179_178a: add ASIX AX88179_178A USB 3.0/2.0 to gigabit
          ethernet adapter support
  * DP01: PCI: Remove not needed check in disable aspm link (fixes ath5k)
  * DS10: Intel Wellsburg PCH alsa support
  * FR01: Reiser4 support
- update defconfigs
1
2 Makefile | 23 ++++++++++++-----------
3 scripts/kconfig/Makefile | 19 -------------------
4 2 files changed, 12 insertions(+), 30 deletions(-)
5
6 diff -Nurp linux-3.8-rc3-mrp/Makefile linux-3.8-rc3-mrp.fix/Makefile
7 --- linux-3.8-rc3-mrp/Makefile 2013-01-10 08:46:02.309435198 +0200
8 +++ linux-3.8-rc3-mrp.fix/Makefile 2013-01-10 08:46:38.470246165 +0200
9 @@ -513,8 +513,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 - $(Q)$(MAKE) $(build)=$(@)
15 +scripts:
16
17 # Objects we will link into vmlinux / subdirs we need to visit
18 init-y := init/
19 @@ -831,7 +830,7 @@ prepare0: archprepare FORCE
20 $(Q)$(MAKE) $(build)=.
21
22 # All the preparing..
23 -prepare: prepare0
24 +prepare:
25
26 # Generate some files
27 # ---------------------------------------------------------------------------
28 @@ -1013,13 +1012,15 @@ endif # CONFIG_MODULES
29 CLEAN_DIRS += $(MODVERDIR)
30
31 # Directories & files removed with 'make mrproper'
32 -MRPROPER_DIRS += include/config usr/include include/generated \
33 - arch/*/include/generated
34 -MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
35 - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
36 - signing_key.priv signing_key.x509 x509.genkey \
37 - extra_certificates signing_key.x509.keyid \
38 - signing_key.x509.signer
39 +#MRPROPER_DIRS += include/config usr/include include/generated \
40 +# arch/*/include/generated
41 +#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
42 +# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
43 +# signing_key.priv signing_key.x509 x509.genkey \
44 +# extra_certificates signing_key.x509.keyid \
45 +# signing_key.x509.signer
46 +MRPROPER_DIRS += ""
47 +MRPROPER_FILES += ""
48
49 # clean - Delete most, but leave enough to build external modules
50 #
51 @@ -1040,7 +1041,7 @@ clean: archclean vmlinuxclean
52 #
53 mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
54 mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
55 -mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook scripts)
56 +mrproper-dirs := $(addprefix _mrproper_,Documentation/DocBook)
57
58 PHONY += $(mrproper-dirs) mrproper archmrproper
59 $(mrproper-dirs):
60 diff -Nurp linux-3.8-rc3-mrp/scripts/kconfig/Makefile linux-3.8-rc3-mrp.fix/scripts/kconfig/Makefile
61 --- linux-3.8-rc3-mrp/scripts/kconfig/Makefile 2013-01-10 08:46:02.309435198 +0200
62 +++ linux-3.8-rc3-mrp.fix/scripts/kconfig/Makefile 2013-01-10 08:46:38.480246389 +0200
63 @@ -12,26 +12,18 @@ Kconfig := Kconfig
64 endif
65
66 xconfig: $(obj)/qconf 3rdparty/Makefile
67 - $< $(Kconfig)
68
69 gconfig: $(obj)/gconf 3rdparty/Makefile
70 - $< $(Kconfig)
71
72 menuconfig: $(obj)/mconf 3rdparty/Makefile
73 - $< $(Kconfig)
74
75 config: $(obj)/conf 3rdparty/Makefile
76 - $< --oldaskconfig $(Kconfig)
77
78 nconfig: $(obj)/nconf 3rdparty/Makefile
79 - $< $(Kconfig)
80
81 oldconfig: $(obj)/conf 3rdparty/Makefile
82 - $< --$@ $(Kconfig)
83
84 silentoldconfig: $(obj)/conf 3rdparty/Makefile
85 - $(Q)mkdir -p include/generated
86 - $< --$@ $(Kconfig)
87
88 localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
89 $(Q)mkdir -p include/generated
90 @@ -74,32 +66,21 @@ update-po-config: $(obj)/kxgettext $(obj
91 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
92
93 allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
94 - $< --$@ $(Kconfig)
95
96 PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
97
98 listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
99 - $< --$@ $(Kconfig)
100
101 # oldnoconfig is an alias of olddefconfig, because people already are dependent
102 # on its behavior(sets new symbols to their default value but not 'n') with the
103 # counter-intuitive name.
104 oldnoconfig: $(obj)/conf 3rdparty/Makefile
105 - $< --olddefconfig $(Kconfig)
106
107 savedefconfig: $(obj)/conf 3rdparty/Makefile
108 - $< --$@=defconfig $(Kconfig)
109
110 defconfig: $(obj)/conf 3rdparty/Makefile
111 -ifeq ($(KBUILD_DEFCONFIG),)
112 - $< --defconfig $(Kconfig)
113 -else
114 - @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
115 - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
116 -endif
117
118 %_defconfig: $(obj)/conf 3rdparty/Makefile
119 - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
120
121 # Help text used by make help
122 help:
  ViewVC Help
Powered by ViewVC 1.1.30