wok annotate linux/stuff/linux-diff-2.6.30.6.u @ rev 4293

firefox-dev: fix version hack
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Sep 26 20:20:32 2009 +0200 (2009-09-26)
parents
children
rev   line source
pankso@4056 1 --- linux-2.6.30.3/arch/x86/vdso/Makefile
pankso@4056 2 +++ linux-2.6.30.3/arch/x86/vdso/Makefile
pankso@4056 3 @@ -104,10 +104,12 @@
pankso@4056 4 $(foreach H,$(filter-out FORCE,$^),\
pankso@4056 5 if grep -q VDSO32_SYSENTER_RETURN $H; \
pankso@4056 6 then diff -u $(@D)/.tmp_$(@F) $H; \
pankso@4056 7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
pankso@4056 8 - diff -u - $H; fi &&) : ;\
pankso@4056 9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \
pankso@4056 10 + $(@D)/.tmp_$(@F).$$ ; \
pankso@4056 11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\
pankso@4056 12 then mv -f $(@D)/.tmp_$(@F) $@; \
pankso@4056 13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \
pankso@4056 14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \
pankso@4056 15 + rm -f $(@D)/.tmp_$(@F)*; \
pankso@4056 16 fi
pankso@4056 17 endef
pankso@4056 18
pankso@4056 19
pankso@4056 20 --- linux-2.6.30.3/scripts/Makefile.lib
pankso@4056 21 +++ linux-2.6.30.3/scripts/Makefile.lib
pankso@4056 22 @@ -204,4 +204,4 @@
pankso@4056 23 # ---------------------------------------------------------------------------
pankso@4056 24
pankso@4056 25 quiet_cmd_lzma = LZMA $@
pankso@4056 26 -cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
pankso@4056 27 +cmd_lzma = (lzma e $< -so && $(size_append) $<) >$@ || (rm -f $@ ; false)