/[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 467214 by tmb, Sat Aug 17 11:34:02 2013 UTC revision 496719 by tmb, Sun Oct 13 23:13:47 2013 UTC
# Line 3  Line 3 
3   scripts/kconfig/Makefile |   19 -------------------   scripts/kconfig/Makefile |   19 -------------------
4   2 files changed, 12 insertions(+), 31 deletions(-)   2 files changed, 12 insertions(+), 31 deletions(-)
5    
6  diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile  diff -Nurp linux-3.12-rc5-mga1/Makefile linux-3.12-rc5-mga1-mrp/Makefile
7  --- linux-3.10.1-mga1/Makefile  2013-07-14 19:13:58.126152807 +0300  --- linux-3.12-rc5-mga1/Makefile        2013-10-13 15:16:07.515274564 +0300
8  +++ linux-3.10.1-mga1.mrp/Makefile      2013-07-14 19:16:14.385315249 +0300  +++ linux-3.12-rc5-mga1-mrp/Makefile    2013-10-13 15:19:42.226094694 +0300
9  @@ -513,9 +513,7 @@ ifeq ($(KBUILD_EXTMOD),)  @@ -513,9 +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
# Line 17  diff -Nurp linux-3.10.1-mga1/Makefile li Line 17  diff -Nurp linux-3.10.1-mga1/Makefile li
17    
18   # Objects we will link into vmlinux / subdirs we need to visit   # Objects we will link into vmlinux / subdirs we need to visit
19   init-y         := init/   init-y         := init/
20  @@ -835,7 +833,7 @@ prepare0: archprepare FORCE  @@ -838,7 +836,7 @@ prepare0: archprepare FORCE
21          $(Q)$(MAKE) $(build)=.          $(Q)$(MAKE) $(build)=.
22    
23   # All the preparing..   # All the preparing..
# Line 26  diff -Nurp linux-3.10.1-mga1/Makefile li Line 26  diff -Nurp linux-3.10.1-mga1/Makefile li
26    
27   # Generate some files   # Generate some files
28   # ---------------------------------------------------------------------------   # ---------------------------------------------------------------------------
29  @@ -1017,13 +1015,15 @@ endif # CONFIG_MODULES  @@ -1020,13 +1018,15 @@ endif # CONFIG_MODULES
30   CLEAN_DIRS  += $(MODVERDIR)   CLEAN_DIRS  += $(MODVERDIR)
31    
32   # Directories & files removed with 'make mrproper'   # Directories & files removed with 'make mrproper'
# Line 49  diff -Nurp linux-3.10.1-mga1/Makefile li Line 49  diff -Nurp linux-3.10.1-mga1/Makefile li
49    
50   # clean - Delete most, but leave enough to build external modules   # clean - Delete most, but leave enough to build external modules
51   #   #
52  @@ -1044,7 +1044,7 @@ clean: archclean vmlinuxclean  @@ -1047,7 +1047,7 @@ clean: archclean vmlinuxclean
53   #   #
54   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
55   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
# Line 58  diff -Nurp linux-3.10.1-mga1/Makefile li Line 58  diff -Nurp linux-3.10.1-mga1/Makefile li
58    
59   PHONY += $(mrproper-dirs) mrproper archmrproper   PHONY += $(mrproper-dirs) mrproper archmrproper
60   $(mrproper-dirs):   $(mrproper-dirs):
61  diff -Nurp linux-3.10.1-mga1/scripts/kconfig/Makefile linux-3.10.1-mga1.mrp/scripts/kconfig/Makefile  diff -Nurp linux-3.12-rc5-mga1/scripts/kconfig/Makefile linux-3.12-rc5-mga1-mrp/scripts/kconfig/Makefile
62  --- linux-3.10.1-mga1/scripts/kconfig/Makefile  2013-07-14 19:13:58.126152807 +0300  --- linux-3.12-rc5-mga1/scripts/kconfig/Makefile        2013-10-13 15:16:07.515274564 +0300
63  +++ linux-3.10.1-mga1.mrp/scripts/kconfig/Makefile      2013-07-14 19:16:14.386315260 +0300  +++ linux-3.12-rc5-mga1-mrp/scripts/kconfig/Makefile    2013-10-13 15:19:42.226094694 +0300
64  @@ -15,26 +15,18 @@ endif  @@ -15,26 +15,18 @@ endif
65   unexport CONFIG_   unexport CONFIG_
66    

Legend:
Removed from v.467214  
changed lines
  Added in v.496719

  ViewVC Help
Powered by ViewVC 1.1.30