/[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 134369 - (hide annotations) (download)
Thu Aug 18 22:09:27 2011 UTC (12 years, 8 months ago) by tmb
Original Path: cauldron/kernel-tmb/current/SOURCES/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
File size: 4005 byte(s) 
- update to 3.0.3
- update patches:
    * CK01: Con Kolivas -ck patchset including BFS
    * FU01: unionfs 2.5.9.2
    * KP01: TuxonIce 3.2
- drop merged patches:
    * CK02, DA60-DA61, DG10-DG14, DN08, DN15-DN19, DP05-DP08
    * DP20-DP26, DP30, DV11, FU02-FU03, MK01, NI30-NI31
- add patches:
    * AA01: genirq: Fix wrong bit operation
    * DP10-DP12: samsung-laptop: support nc110, nc210, r700, x520
    * DP13: samsung-laptop: fix support for older N150, N210, N220
    * FB01: btrfs: btrfs_calc_avail_data_space: cope with no read_write devices
    * MB17: ndiswrapper buildfix for 3.0
    * MC84: viahss buildfix for 3.0
- rediff patches:
    * NI16: netfilter psd mdv/mga modifications
- disable patches:
    * DV01-DV02: framebuffer oops fixes (should not be needed anymore)
    * FR01: reiser4 support (broken)
- adapt spec for 3.0 series version changes
- change kernel-tmb-source to noarch
- build with -s(ilent) to only log varnings and errors
- update defconfigs
1 tmb 61100
2 tmb 134369 Makefile | 19 ++++++++++---------
3 tmb 61100 scripts/kconfig/Makefile | 18 ------------------
4 tmb 134369 2 files changed, 10 insertions(+), 27 deletions(-)
5 tmb 61100
6 tmb 134369 diff -Nurp linux-3.0/Makefile linux-3.0-mrproper/Makefile
7     --- linux-3.0/Makefile 2011-07-15 02:37:36.866554406 +0300
8     +++ linux-3.0-mrproper/Makefile 2011-07-15 14:14:32.143899236 +0300
9     @@ -502,8 +502,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     -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 tmb 134369 @@ -986,7 +985,7 @@ prepare0: archprepare FORCE
20 tmb 78708 $(Q)$(MAKE) $(build)=. missing-syscalls
21    
22     # All the preparing..
23     -prepare: prepare0
24     +prepare:
25    
26     # Generate some files
27     # ---------------------------------------------------------------------------
28 tmb 134369 @@ -1158,11 +1157,13 @@ CLEAN_FILES += vmlinux System.map \
29 tmb 78708 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
30    
31     # Directories & files removed with 'make mrproper'
32 tmb 134369 -MRPROPER_DIRS += include/config usr/include include/generated \
33     - arch/*/include/generated
34 tmb 78708 -MRPROPER_FILES += .config .config.old .version .old_version \
35     - include/linux/version.h \
36 tmb 134369 - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
37     +#MRPROPER_DIRS += include/config usr/include include/generated \
38     +# arch/*/include/generated
39     +#MRPROPER_FILES += .config .config.old .version .old_version \
40     +# include/linux/version.h \
41     +# Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
42     +MRPROPER_DIRS += ""
43     +MRPROPER_FILES += ""
44 tmb 78708
45     # clean - Delete most, but leave enough to build external modules
46     #
47 tmb 134369 @@ -1180,7 +1181,7 @@ clean: archclean
48 tmb 78708 #
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 tmb 134369 diff -Nurp linux-3.0/scripts/kconfig/Makefile linux-3.0-mrproper/scripts/kconfig/Makefile
57     --- linux-3.0/scripts/kconfig/Makefile 2011-07-15 02:37:27.265495491 +0300
58     +++ linux-3.0-mrproper/scripts/kconfig/Makefile 2011-07-15 14:13:12.384408058 +0300
59 tmb 78708 @@ -12,26 +12,18 @@ Kconfig := Kconfig
60 tmb 61100 endif
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     # if no path is given, then use src directory to find file
85     ifdef LSMOD
86 tmb 134369 @@ -99,26 +91,16 @@ update-po-config: $(obj)/kxgettext $(obj
87 tmb 61100 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
88    
89     allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
90     - $< --$@ $(Kconfig)
91    
92     PHONY += listnewconfig oldnoconfig savedefconfig defconfig
93    
94     listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile
95     - $< --$@ $(Kconfig)
96    
97     savedefconfig: $(obj)/conf 3rdparty/Makefile
98     - $< --$@=defconfig $(Kconfig)
99    
100     defconfig: $(obj)/conf 3rdparty/Makefile
101     -ifeq ($(KBUILD_DEFCONFIG),)
102     - $< --defconfig $(Kconfig)
103     -else
104     - @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
105     - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
106     -endif
107    
108     %_defconfig: $(obj)/conf 3rdparty/Makefile
109     - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
110    
111     # Help text used by make help
112     help:
  ViewVC Help
Powered by ViewVC 1.1.30