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

cdrtools: remove a wrong error trigger
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Sep 27 09:56:20 2013 +0000 (2013-09-27)
parents 6f536abe4f0b
children 8580e54b5284
rev   line source
pankso@12285 1 --- linux-2.6.30.6/arch/x86/vdso/Makefile
pankso@12285 2 +++ linux-2.6.30.6/arch/x86/vdso/Makefile
pankso@12285 3 @@ -104,10 +104,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
pankso@12285 20 --- linux-2.6.34/scripts/Makefile.lib
pankso@12285 21 +++ linux-2.6.34/scripts/Makefile.lib
pankso@12285 22 @@ -204,7 +204,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
pankso@12285 31
pankso@12285 32 @@ -253,7 +254,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
pankso@12285 40 quiet_cmd_lzo = LZO $@