/[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 408959 by pterjan, Thu Jan 17 21:30:27 2013 UTC revision 408960 by tmb, Sun Apr 7 19:46:34 2013 UTC
# Line 1  Line 1 
1    
2   Makefile                 |   19 ++++++++++---------   Makefile                 |   23 ++++++++++++-----------
3   scripts/kconfig/Makefile |   18 ------------------   scripts/kconfig/Makefile |   19 -------------------
4   2 files changed, 10 insertions(+), 27 deletions(-)   2 files changed, 12 insertions(+), 30 deletions(-)
5    
6  diff -Nurp linux-3.5.0-1.mga3/Makefile linux-3.5.0-1.mga3-mrproper/Makefile  diff -Nurp linux-3.8-rc3-mrp/Makefile linux-3.8-rc3-mrp.fix/Makefile
7  --- linux-3.5.0-1.mga3/Makefile 2012-07-27 23:16:37.675388630 +0300  --- linux-3.8-rc3-mrp/Makefile  2013-01-10 08:46:02.309435198 +0200
8  +++ linux-3.5.0-1.mga3-mrproper/Makefile        2012-07-27 23:18:19.350231258 +0300  +++ linux-3.8-rc3-mrp.fix/Makefile      2013-01-10 08:46:38.470246165 +0200
9  @@ -499,8 +499,7 @@ ifeq ($(KBUILD_EXTMOD),)  @@ -513,8 +513,7 @@ ifeq ($(KBUILD_EXTMOD),)
10   # Carefully list dependencies so we do not try to build scripts twice   # Carefully list dependencies so we do not try to build scripts twice
11   # in parallel   # in parallel
12   PHONY += scripts   PHONY += scripts
# Line 16  diff -Nurp linux-3.5.0-1.mga3/Makefile l Line 16  diff -Nurp linux-3.5.0-1.mga3/Makefile l
16    
17   # Objects we will link into vmlinux / subdirs we need to visit   # Objects we will link into vmlinux / subdirs we need to visit
18   init-y         := init/   init-y         := init/
19  @@ -815,7 +814,7 @@ prepare0: archprepare FORCE  @@ -831,7 +830,7 @@ prepare0: archprepare FORCE
20          $(Q)$(MAKE) $(build)=.          $(Q)$(MAKE) $(build)=.
21    
22   # All the preparing..   # All the preparing..
# Line 25  diff -Nurp linux-3.5.0-1.mga3/Makefile l Line 25  diff -Nurp linux-3.5.0-1.mga3/Makefile l
25    
26   # Generate some files   # Generate some files
27   # ---------------------------------------------------------------------------   # ---------------------------------------------------------------------------
28  @@ -991,11 +990,13 @@ endif # CONFIG_MODULES  @@ -1013,13 +1012,15 @@ endif # CONFIG_MODULES
29   CLEAN_DIRS  += $(MODVERDIR)   CLEAN_DIRS  += $(MODVERDIR)
30    
31   # Directories & files removed with 'make mrproper'   # Directories & files removed with 'make mrproper'
32  -MRPROPER_DIRS  += include/config usr/include include/generated          \  -MRPROPER_DIRS  += include/config usr/include include/generated          \
33  -                  arch/*/include/generated  -                  arch/*/include/generated
34  -MRPROPER_FILES += .config .config.old .version .old_version             \  -MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
35  -                  include/linux/version.h                               \  -                 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
36  -                 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS  -                 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          \  +#MRPROPER_DIRS  += include/config usr/include include/generated          \
40  +#                  arch/*/include/generated  +#                  arch/*/include/generated
41  +#MRPROPER_FILES += .config .config.old .version .old_version             \  +#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
42  +#                  include/linux/version.h                               \  +#                Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
43  +#                Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS  +#                signing_key.priv signing_key.x509 x509.genkey         \
44    +#                extra_certificates signing_key.x509.keyid             \
45    +#                signing_key.x509.signer
46  +MRPROPER_DIRS  += ""  +MRPROPER_DIRS  += ""
47  +MRPROPER_FILES += ""  +MRPROPER_FILES += ""
48    
49   # clean - Delete most, but leave enough to build external modules   # clean - Delete most, but leave enough to build external modules
50   #   #
51  @@ -1013,7 +1014,7 @@ clean: archclean  @@ -1040,7 +1041,7 @@ clean: archclean vmlinuxclean
52   #   #
53   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
54   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
# Line 53  diff -Nurp linux-3.5.0-1.mga3/Makefile l Line 57  diff -Nurp linux-3.5.0-1.mga3/Makefile l
57    
58   PHONY += $(mrproper-dirs) mrproper archmrproper   PHONY += $(mrproper-dirs) mrproper archmrproper
59   $(mrproper-dirs):   $(mrproper-dirs):
60  diff -Nurp linux-3.5.0-1.mga3/scripts/kconfig/Makefile linux-3.5.0-1.mga3-mrproper/scripts/kconfig/Makefile  diff -Nurp linux-3.8-rc3-mrp/scripts/kconfig/Makefile linux-3.8-rc3-mrp.fix/scripts/kconfig/Makefile
61  --- linux-3.5.0-1.mga3/scripts/kconfig/Makefile 2012-07-27 23:16:37.676388639 +0300  --- linux-3.8-rc3-mrp/scripts/kconfig/Makefile  2013-01-10 08:46:02.309435198 +0200
62  +++ linux-3.5.0-1.mga3-mrproper/scripts/kconfig/Makefile        2012-07-27 23:18:19.350231258 +0300  +++ linux-3.8-rc3-mrp.fix/scripts/kconfig/Makefile      2013-01-10 08:46:38.480246389 +0200
63  @@ -12,26 +12,18 @@ Kconfig := Kconfig  @@ -12,26 +12,18 @@ Kconfig := Kconfig
64   endif   endif
65    
# Line 83  diff -Nurp linux-3.5.0-1.mga3/scripts/kc Line 87  diff -Nurp linux-3.5.0-1.mga3/scripts/kc
87    
88   localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile   localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
89          $(Q)mkdir -p include/generated          $(Q)mkdir -p include/generated
90  @@ -74,26 +66,16 @@ update-po-config: $(obj)/kxgettext $(obj  @@ -74,32 +66,21 @@ update-po-config: $(obj)/kxgettext $(obj
91   PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig   PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
92    
93   allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile   allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
94  -       $< --$@ $(Kconfig)  -       $< --$@ $(Kconfig)
95    
96   PHONY += listnewconfig oldnoconfig savedefconfig defconfig   PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
97    
98   listnewconfig oldnoconfig: $(obj)/conf 3rdparty/Makefile   listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
99  -       $< --$@ $(Kconfig)  -       $< --$@ $(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   savedefconfig: $(obj)/conf 3rdparty/Makefile
108  -       $< --$@=defconfig $(Kconfig)  -       $< --$@=defconfig $(Kconfig)
109    
Legend:
Removed from v.408959  
changed lines
  Added in v.408960
  ViewVC Help
Powered by ViewVC 1.1.30