wok annotate linux/stuff/linux-diff.u @ rev 18896

linux: CONFIG_INPUT_WISTRON_BTNS=m
author Richard Dunbar <mojo@slitaz.org>
date Sat Feb 13 16:01:41 2016 -0500 (2016-02-13)
parents 8580e54b5284
children 708b5293dd29
rev   line source
pascal@15671 1 --- linux-3.2.53/arch/x86/vdso/Makefile
pascal@15671 2 +++ linux-3.2.53/arch/x86/vdso/Makefile
pascal@15671 3 @@ -118,10 +118,12 @@
pankso@12285 4 $(foreach H,$(filter-out FORCE,$^),\
pankso@12285 5 if grep -q VDSO32_SYSENTER_RETURN $H; \
pankso@12285 6 then diff -u $(@D)/.tmp_$(@F) $H; \
pankso@12285 7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
pankso@12285 8 - diff -u - $H; fi &&) : ;\
pankso@12285 9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \
pankso@12285 10 + $(@D)/.tmp_$(@F).$$ ; \
pankso@12285 11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\
pankso@12285 12 then mv -f $(@D)/.tmp_$(@F) $@; \
pankso@12285 13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \
pankso@12285 14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \
pankso@12285 15 + rm -f $(@D)/.tmp_$(@F)*; \
pankso@12285 16 fi
pankso@12285 17 endef
pankso@12285 18
pankso@12285 19
pascal@15671 20 --- linux-3.2.53/scripts/Makefile.lib
pascal@15671 21 +++ linux-3.2.53/scripts/Makefile.lib
pascal@15671 22 @@ -239,7 +239,8 @@
pankso@12285 23 # ---------------------------------------------------------------------------
pankso@12285 24
pankso@12285 25 quiet_cmd_gzip = GZIP $@
pankso@12285 26 -cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
pankso@12285 27 +cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) && \
pankso@12285 28 + ( which advdef > /dev/null && advdef -z $@ ; true ) || \
pankso@12285 29 (rm -f $@ ; false)
pankso@12285 30
pascal@15671 31 # DTC
pascal@15672 32 @@ -296,7 +297,7 @@
pankso@12285 33
pankso@12285 34 quiet_cmd_lzma = LZMA $@
pankso@12285 35 cmd_lzma = (cat $(filter-out FORCE,$^) | \
pankso@12285 36 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
pascal@14801 37 + xz -z -e --format=lzma --lzma1=mode=normal --stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
pankso@12285 38 (rm -f $@ ; false)
pankso@12285 39
pascal@15671 40 quiet_cmd_lzo = LZO $@