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

Diff of /cauldron/kernel/current/SOURCES/disable-mrproper-in-devel-rpms.patch

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

revision 1463895 by tmb, Wed Sep 25 18:30:55 2019 UTC revision 1463896 by tmb, Sat Nov 30 23:31:54 2019 UTC
# Line 1  Line 1 
1    
2   Makefile                 |   16 +++++-----------   Makefile                 |   18 +++++-------------
3   scripts/kconfig/Makefile |    4 ----   scripts/kconfig/Makefile |    4 ----
4   2 files changed, 5 insertions(+), 15 deletions(-)   2 files changed, 5 insertions(+), 17 deletions(-)
5    
6  diff -Nurp linux-5.3/Makefile linux-5.3-mrp/Makefile  diff -Nurp linux-5.4.orig/Makefile linux-5.4/Makefile
7  --- linux-5.3/Makefile  2019-09-25 00:53:01.649017174 +0300  --- linux-5.4.orig/Makefile     2019-11-30 23:06:49.394199628 +0200
8  +++ linux-5.3-mrp/Makefile      2019-09-25 00:54:22.246013961 +0300  +++ linux-5.4/Makefile  2019-11-30 23:08:00.927203318 +0200
9  @@ -1093,8 +1093,7 @@ include/config/kernel.release: FORCE  @@ -1093,8 +1093,7 @@ include/config/kernel.release: FORCE
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 16  diff -Nurp linux-5.3/Makefile linux-5.3- Line 16  diff -Nurp linux-5.3/Makefile linux-5.3-
16    
17   # Things we need to do before we recursively start building the kernel   # Things we need to do before we recursively start building the kernel
18   # or the modules are listed in "prepare".   # or the modules are listed in "prepare".
19  @@ -1127,7 +1126,7 @@ prepare0: archprepare  @@ -1112,7 +1111,7 @@ prepare0: archprepare
20          $(Q)$(MAKE) $(build)=.          $(Q)$(MAKE) $(build)=.
21    
22   # All the preparing..   # All the preparing..
# Line 25  diff -Nurp linux-5.3/Makefile linux-5.3- Line 25  diff -Nurp linux-5.3/Makefile linux-5.3-
25    
26   # Support for using generic headers in asm-generic   # Support for using generic headers in asm-generic
27   asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj   asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
28  @@ -1380,13 +1379,8 @@ CLEAN_DIRS  += include/ksym  @@ -1363,15 +1362,8 @@ CLEAN_DIRS  += include/ksym
29   CLEAN_FILES += modules.builtin.modinfo   CLEAN_FILES += modules.builtin.modinfo
30    
31   # Directories & files removed with 'make mrproper'   # Directories & files removed with 'make mrproper'
32  -MRPROPER_DIRS  += include/config include/generated          \  -MRPROPER_DIRS  += include/config include/generated          \
33  -                 arch/$(SRCARCH)/include/generated .tmp_objdiff  -                 arch/$(SRCARCH)/include/generated .tmp_objdiff \
34    -                 debian/ snap/ tar-install/
35  -MRPROPER_FILES += .config .config.old .version \  -MRPROPER_FILES += .config .config.old .version \
36  -                 Module.symvers \  -                 Module.symvers \
37  -                 signing_key.pem signing_key.priv signing_key.x509     \  -                 signing_key.pem signing_key.priv signing_key.x509     \
38  -                 x509.genkey extra_certificates signing_key.x509.keyid \  -                 x509.genkey extra_certificates signing_key.x509.keyid \
39  -                 signing_key.x509.signer vmlinux-gdb.py  -                 signing_key.x509.signer vmlinux-gdb.py \
40    -                 *.spec
41  +MRPROPER_DIRS  += ""  +MRPROPER_DIRS  += ""
42  +MRPROPER_FILES += ""  +MRPROPER_FILES += ""
43    
44   # Directories & files removed with 'make distclean'   # Directories & files removed with 'make distclean'
45   DISTCLEAN_DIRS  +=   DISTCLEAN_DIRS  +=
46  @@ -1412,7 +1406,7 @@ clean: archclean vmlinuxclean  @@ -1394,7 +1386,7 @@ clean: archclean vmlinuxclean
47   #   #
48   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))   mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
49   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))   mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
# Line 50  diff -Nurp linux-5.3/Makefile linux-5.3- Line 52  diff -Nurp linux-5.3/Makefile linux-5.3-
52    
53   PHONY += $(mrproper-dirs) mrproper   PHONY += $(mrproper-dirs) mrproper
54   $(mrproper-dirs):   $(mrproper-dirs):
55  diff -Nurp linux-5.3/scripts/kconfig/Makefile linux-5.3-mrp/scripts/kconfig/Makefile  diff -Nurp linux-5.4.orig/scripts/kconfig/Makefile linux-5.4/scripts/kconfig/Makefile
56  --- linux-5.3/scripts/kconfig/Makefile  2019-09-16 00:19:32.000000000 +0300  --- linux-5.4.orig/scripts/kconfig/Makefile     2019-11-25 02:32:01.000000000 +0200
57  +++ linux-5.3-mrp/scripts/kconfig/Makefile      2019-09-25 00:53:45.915015409 +0300  +++ linux-5.4/scripts/kconfig/Makefile  2019-11-30 23:07:24.957201462 +0200
58  @@ -24,16 +24,12 @@ endif  @@ -24,16 +24,12 @@ endif
59   unexport CONFIG_   unexport CONFIG_
60    
Legend:
Removed from v.1463895  
changed lines
  Added in v.1463896
  ViewVC Help
Powered by ViewVC 1.1.30