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

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

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

revision 408960 by tmb, Sun Apr 7 19:46:34 2013 UTC revision 435269 by tmb, Sun Jun 2 18:58:28 2013 UTC
# Line 1  Line 1 
1    diff -Nurp linux-3.9.4-mga0.8/Makefile linux-3.9.4-mga0.8-mrp/Makefile
2   Makefile                 |   23 ++++++++++++-----------  --- linux-3.9.4-mga0.8/Makefile 2013-06-02 14:37:28.025017241 +0300
3   scripts/kconfig/Makefile |   19 -------------------  +++ linux-3.9.4-mga0.8-mrp/Makefile     2013-06-02 14:38:36.759598104 +0300
4   2 files changed, 12 insertions(+), 30 deletions(-)  @@ -513,9 +513,7 @@ ifeq ($(KBUILD_EXTMOD),)
   
 diff -Nurp linux-3.8-rc3-mrp/Makefile linux-3.8-rc3-mrp.fix/Makefile  
 --- linux-3.8-rc3-mrp/Makefile  2013-01-10 08:46:02.309435198 +0200  
 +++ linux-3.8-rc3-mrp.fix/Makefile      2013-01-10 08:46:38.470246165 +0200  
 @@ -513,8 +513,7 @@ ifeq ($(KBUILD_EXTMOD),)  
5   # Carefully list dependencies so we do not try to build scripts twice   # Carefully list dependencies so we do not try to build scripts twice
6   # in parallel   # in parallel
7   PHONY += scripts   PHONY += scripts
8  -scripts: scripts_basic include/config/auto.conf include/config/tristate.conf  -scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
9    -        asm-generic
10  -       $(Q)$(MAKE) $(build)=$(@)  -       $(Q)$(MAKE) $(build)=$(@)
11  +scripts:  +scripts:
12    
13   # Objects we will link into vmlinux / subdirs we need to visit   # Objects we will link into vmlinux / subdirs we need to visit
14   init-y         := init/   init-y         := init/
15  @@ -831,7 +830,7 @@ prepare0: archprepare FORCE  @@ -833,7 +831,7 @@ prepare0: archprepare FORCE
16          $(Q)$(MAKE) $(build)=.          $(Q)$(MAKE) $(build)=.
17    
18   # All the preparing..   # All the preparing..
# Line 25  diff -Nurp linux-3.8-rc3-mrp/Makefile li Line 21  diff -Nurp linux-3.8-rc3-mrp/Makefile li
21    
22   # Generate some files   # Generate some files
23   # ---------------------------------------------------------------------------   # ---------------------------------------------------------------------------
24  @@ -1013,13 +1012,15 @@ endif # CONFIG_MODULES  @@ -1015,13 +1013,15 @@ endif # CONFIG_MODULES
25   CLEAN_DIRS  += $(MODVERDIR)   CLEAN_DIRS  += $(MODVERDIR)
26    
27   # Directories & files removed with 'make mrproper'   # Directories & files removed with 'make mrproper'
# Line 48  diff -Nurp linux-3.8-rc3-mrp/Makefile li Line 44  diff -Nurp linux-3.8-rc3-mrp/Makefile li
44    
45   # clean - Delete most, but leave enough to build external modules   # clean - Delete most, but leave enough to build external modules
46   #   #
47  @@ -1040,7 +1041,7 @@ clean: archclean vmlinuxclean  @@ -1042,7 +1042,7 @@ clean: archclean vmlinuxclean
48   #   #
49   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
50   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
# Line 57  diff -Nurp linux-3.8-rc3-mrp/Makefile li Line 53  diff -Nurp linux-3.8-rc3-mrp/Makefile li
53    
54   PHONY += $(mrproper-dirs) mrproper archmrproper   PHONY += $(mrproper-dirs) mrproper archmrproper
55   $(mrproper-dirs):   $(mrproper-dirs):
56  diff -Nurp linux-3.8-rc3-mrp/scripts/kconfig/Makefile linux-3.8-rc3-mrp.fix/scripts/kconfig/Makefile  diff -Nurp linux-3.9.4-mga0.8/scripts/kconfig/Makefile linux-3.9.4-mga0.8-mrp/scripts/kconfig/Makefile
57  --- linux-3.8-rc3-mrp/scripts/kconfig/Makefile  2013-01-10 08:46:02.309435198 +0200  --- linux-3.9.4-mga0.8/scripts/kconfig/Makefile 2013-06-02 14:37:28.025017241 +0300
58  +++ linux-3.8-rc3-mrp.fix/scripts/kconfig/Makefile      2013-01-10 08:46:38.480246389 +0200  +++ linux-3.9.4-mga0.8-mrp/scripts/kconfig/Makefile     2013-06-02 14:38:08.917362838 +0300
59  @@ -12,26 +12,18 @@ Kconfig := Kconfig  @@ -15,26 +15,18 @@ endif
60   endif   unexport CONFIG_
61    
62   xconfig: $(obj)/qconf 3rdparty/Makefile   xconfig: $(obj)/qconf 3rdparty/Makefile
63  -       $< $(Kconfig)  -       $< $(Kconfig)
# Line 87  diff -Nurp linux-3.8-rc3-mrp/scripts/kco Line 83  diff -Nurp linux-3.8-rc3-mrp/scripts/kco
83    
84   localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile   localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
85          $(Q)mkdir -p include/generated          $(Q)mkdir -p include/generated
86  @@ -74,32 +66,21 @@ update-po-config: $(obj)/kxgettext $(obj  @@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj
87   PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig   PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
88    
89   allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile   allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
Legend:
Removed from v.408960  
changed lines
  Added in v.435269
  ViewVC Help
Powered by ViewVC 1.1.30