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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 61100 by tmb, Sun Feb 27 01:06:05 2011 UTC revision 78708 by tmb, Tue Mar 29 10:06:54 2011 UTC
# Line 3  Line 3 
3   scripts/kconfig/Makefile |   18 ------------------   scripts/kconfig/Makefile |   18 ------------------
4   2 files changed, 5 insertions(+), 26 deletions(-)   2 files changed, 5 insertions(+), 26 deletions(-)
5    
6  --- linux-2.6.36-rc6-tmb0.5/scripts/kconfig/Makefile.orig       2010-09-29 15:13:10.000000000 +0300  diff -urp linux-2.6.38-mga0.2/Makefile linux-2.6.38-mga0.2-mrproper/Makefile
7  +++ linux-2.6.36-rc6-tmb0.5/scripts/kconfig/Makefile    2010-09-29 15:15:46.102172862 +0300  --- linux-2.6.38-mga0.2/Makefile        2011-03-20 05:16:56.702931902 +0200
8  @@ -12,26 +12,18 @@ Kconfig := arch/$(SRCARCH)/Kconfig  +++ linux-2.6.38-mga0.2-mrproper/Makefile       2011-03-20 05:18:01.828314994 +0200
9    @@ -482,8 +482,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    @@ -956,7 +955,7 @@ prepare0: archprepare FORCE
20            $(Q)$(MAKE) $(build)=. missing-syscalls
21    
22     # All the preparing..
23    -prepare: prepare0
24    +prepare:
25    
26     # Generate some files
27     # ---------------------------------------------------------------------------
28    @@ -1132,10 +1131,8 @@ CLEAN_FILES +=   vmlinux System.map \
29                     .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
30    
31     # Directories & files removed with 'make mrproper'
32    -MRPROPER_DIRS  += include/config usr/include include/generated
33    -MRPROPER_FILES += .config .config.old .version .old_version             \
34    -                  include/linux/version.h                               \
35    -                 Module.symvers tags TAGS cscope*
36    +MRPROPER_DIRS  += ""
37    +MRPROPER_FILES += ""
38    
39     # clean - Delete most, but leave enough to build external modules
40     #
41    @@ -1153,7 +1150,7 @@ clean: archclean
42     #
43     mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
44     mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
45    -mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook scripts)
46    +mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook)
47    
48     PHONY += $(mrproper-dirs) mrproper archmrproper
49     $(mrproper-dirs):
50    diff -urp linux-2.6.38-mga0.2/scripts/kconfig/Makefile linux-2.6.38-mga0.2-mrproper/scripts/kconfig/Makefile
51    --- linux-2.6.38-mga0.2/scripts/kconfig/Makefile        2011-03-20 05:16:56.702931902 +0200
52    +++ linux-2.6.38-mga0.2-mrproper/scripts/kconfig/Makefile       2011-03-20 05:18:01.828314994 +0200
53    @@ -12,26 +12,18 @@ Kconfig := Kconfig
54   endif   endif
55    
56   xconfig: $(obj)/qconf 3rdparty/Makefile   xconfig: $(obj)/qconf 3rdparty/Makefile
# Line 59  Line 104 
104    
105   # Help text used by make help   # Help text used by make help
106   help:   help:
 --- linux-2.6.37-rc3-git2-tmb0.1/Makefile.orig  2010-11-25 16:32:08.990171957 +0200  
 +++ linux-2.6.37-rc3-git2-tmb0.1/Makefile       2010-11-25 16:36:18.267763659 +0200  
 @@ -481,8 +481,7 @@ ifeq ($(KBUILD_EXTMOD),)  
  # Carefully list dependencies so we do not try to build scripts twice  
  # in parallel  
  PHONY += scripts  
 -scripts: scripts_basic include/config/auto.conf include/config/tristate.conf  
 -       $(Q)$(MAKE) $(build)=$(@)  
 +scripts:  
   
  # Objects we will link into vmlinux / subdirs we need to visit  
  init-y         := init/  
 @@ -955,7 +954,7 @@ prepare0: archprepare FORCE  
         $(Q)$(MAKE) $(build)=. missing-syscalls  
   
  # All the preparing..  
 -prepare: prepare0  
 +prepare:  
   
  # Generate some files  
  # ---------------------------------------------------------------------------  
 @@ -1131,10 +1130,8 @@ CLEAN_FILES +=   vmlinux System.map \  
                  .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map  
   
  # Directories & files removed with 'make mrproper'  
 -MRPROPER_DIRS  += include/config usr/include include/generated  
 -MRPROPER_FILES += .config .config.old .version .old_version             \  
 -                  include/linux/version.h                               \  
 -                 Module.symvers tags TAGS cscope*  
 +MRPROPER_DIRS  += ""  
 +MRPROPER_FILES += ""  
   
  # clean - Delete most, but leave enough to build external modules  
  #  
 @@ -1152,7 +1149,7 @@ clean: archclean  
  #  
  mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))  
  mrproper: rm-files := $(wildcard $(MRPROPER_FILES))  
 -mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook scripts)  
 +mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook)  
   
  PHONY += $(mrproper-dirs) mrproper archmrproper  
  $(mrproper-dirs):  
Legend:
Removed from v.61100  
changed lines
  Added in v.78708
  ViewVC Help
Powered by ViewVC 1.1.30