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

Diff of /updates/5/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 1000879 by tmb, Sat Apr 9 18:24:12 2016 UTC revision 1000880 by tmb, Tue Apr 12 17:06:40 2016 UTC
# Line 1  Line 1 
1    
2   Makefile                 |   17 +++++------------   Makefile                 |   17 +++++------------
3   scripts/kconfig/Makefile |   19 -------------------   scripts/kconfig/Makefile |   23 -----------------------
4   2 files changed, 5 insertions(+), 31 deletions(-)   2 files changed, 5 insertions(+), 35 deletions(-)
5    
6  diff -Nurp linux-4.4-rc6-mga1/Makefile linux-4.4-rc6-mga1.mrp/Makefile  diff -Nurp linux-4.4.7-mga1/Makefile linux-4.4.7-mga1-mrproper/Makefile
7  --- linux-4.4-rc6-mga1/Makefile 2015-12-21 19:45:45.777842913 +0200  --- linux-4.4.7-mga1/Makefile   2016-04-12 19:49:25.607028071 +0300
8  +++ linux-4.4-rc6-mga1.mrp/Makefile     2015-12-21 19:46:27.534161093 +0200  +++ linux-4.4.7-mga1-mrproper/Makefile  2016-04-12 19:50:54.027047346 +0300
9  @@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),)  @@ -540,9 +540,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 51  diff -Nurp linux-4.4-rc6-mga1/Makefile l Line 51  diff -Nurp linux-4.4-rc6-mga1/Makefile l
51    
52   PHONY += $(mrproper-dirs) mrproper archmrproper   PHONY += $(mrproper-dirs) mrproper archmrproper
53   $(mrproper-dirs):   $(mrproper-dirs):
54  diff -Nurp linux-4.4-rc6-mga1/scripts/kconfig/Makefile linux-4.4-rc6-mga1.mrp/scripts/kconfig/Makefile  diff -Nurp linux-4.4.7-mga1/scripts/kconfig/Makefile linux-4.4.7-mga1-mrproper/scripts/kconfig/Makefile
55  --- linux-4.4-rc6-mga1/scripts/kconfig/Makefile 2015-12-21 19:45:45.777842913 +0200  --- linux-4.4.7-mga1/scripts/kconfig/Makefile   2016-04-12 19:49:25.607028071 +0300
56  +++ linux-4.4-rc6-mga1.mrp/scripts/kconfig/Makefile     2015-12-21 19:47:33.406662682 +0200  +++ linux-4.4.7-mga1-mrproper/scripts/kconfig/Makefile  2016-04-12 19:51:49.180055656 +0300
57  @@ -19,23 +19,16 @@ endif  @@ -19,23 +19,16 @@ endif
58   unexport CONFIG_   unexport CONFIG_
59    
# Line 86  diff -Nurp linux-4.4-rc6-mga1/scripts/kc Line 86  diff -Nurp linux-4.4-rc6-mga1/scripts/kc
86    
87   PHONY += oldnoconfig savedefconfig defconfig   PHONY += oldnoconfig savedefconfig defconfig
88    
89  @@ -91,21 +83,10 @@ PHONY += oldnoconfig savedefconfig defco  @@ -91,23 +83,8 @@ PHONY += oldnoconfig savedefconfig defco
90   oldnoconfig: olddefconfig 3rdparty/Makefile   oldnoconfig: olddefconfig 3rdparty/Makefile
91    
92   savedefconfig: $(obj)/conf 3rdparty/Makefile   savedefconfig: $(obj)/conf 3rdparty/Makefile
93  -       $< $(silent) --$@=defconfig $(Kconfig)  -       $< $(silent) --$@=defconfig $(Kconfig)
94    -
95   defconfig: $(obj)/conf 3rdparty/Makefile  -defconfig: $(obj)/conf 3rdparty/Makefile
96  -ifeq ($(KBUILD_DEFCONFIG),)  -ifeq ($(KBUILD_DEFCONFIG),)
97  -       $< $(silent) --defconfig $(Kconfig)  -       $< $(silent) --defconfig $(Kconfig)
98  -else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)  -else
99    -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
100  -       @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"  -       @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
101  -       $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)  -       $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
102  -else  -else
103  -       @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"  -       @$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
104  -       $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)  -       $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
105  -endif  -endif
106    -endif
107    
108   %_defconfig: $(obj)/conf 3rdparty/Makefile   %_defconfig: $(obj)/conf 3rdparty/Makefile
109  -       $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)  -       $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)

Legend:
Removed from v.1000879  
changed lines
  Added in v.1000880

  ViewVC Help
Powered by ViewVC 1.1.26