wok-current diff linux/stuff/linux-diff.u @ rev 21782
created recipe for xxdiff 4.01
author | Hans-G?nter Theisgen |
---|---|
date | Tue Jul 16 14:57:39 2019 +0100 (2019-07-16) |
parents | 83faf94fc7c8 |
children |
line diff
1.1 --- a/linux/stuff/linux-diff.u Wed Dec 18 15:13:22 2013 +0000 1.2 +++ b/linux/stuff/linux-diff.u Tue Jul 16 14:57:39 2019 +0100 1.3 @@ -1,25 +1,6 @@ 1.4 ---- linux-3.2.53/arch/x86/vdso/Makefile 1.5 -+++ linux-3.2.53/arch/x86/vdso/Makefile 1.6 -@@ -118,10 +118,12 @@ 1.7 - $(foreach H,$(filter-out FORCE,$^),\ 1.8 - if grep -q VDSO32_SYSENTER_RETURN $H; \ 1.9 - then diff -u $(@D)/.tmp_$(@F) $H; \ 1.10 -- else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \ 1.11 -- diff -u - $H; fi &&) : ;\ 1.12 -+ else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \ 1.13 -+ $(@D)/.tmp_$(@F).$$ ; \ 1.14 -+ diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\ 1.15 - then mv -f $(@D)/.tmp_$(@F) $@; \ 1.16 -- else rm -f $(@D)/.tmp_$(@F); exit 1; \ 1.17 -+ else rm -f $(@D)/.tmp_$(@F)*; exit 1; \ 1.18 -+ rm -f $(@D)/.tmp_$(@F)*; \ 1.19 - fi 1.20 - endef 1.21 - 1.22 - 1.23 ---- linux-3.2.53/scripts/Makefile.lib 1.24 -+++ linux-3.2.53/scripts/Makefile.lib 1.25 -@@ -239,7 +239,8 @@ 1.26 +--- linux-3.16.53/scripts/Makefile.lib 1.27 ++++ linux-3.16.53/scripts/Makefile.lib 1.28 +@@ -238,7 +238,8 @@ 1.29 # --------------------------------------------------------------------------- 1.30 1.31 quiet_cmd_gzip = GZIP $@ 1.32 @@ -29,7 +10,7 @@ 1.33 (rm -f $@ ; false) 1.34 1.35 # DTC 1.36 -@@ -296,7 +297,7 @@ 1.37 +@@ -316,7 +317,7 @@ 1.38 1.39 quiet_cmd_lzma = LZMA $@ 1.40 cmd_lzma = (cat $(filter-out FORCE,$^) | \