wok diff 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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux/stuff/linux-diff-2.6.30.6.u	Sat Sep 26 20:20:32 2009 +0200
     1.3 @@ -0,0 +1,27 @@
     1.4 +--- linux-2.6.30.3/arch/x86/vdso/Makefile
     1.5 ++++ linux-2.6.30.3/arch/x86/vdso/Makefile
     1.6 +@@ -104,10 +104,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-2.6.30.3/scripts/Makefile.lib
    1.24 ++++ linux-2.6.30.3/scripts/Makefile.lib
    1.25 +@@ -204,4 +204,4 @@
    1.26 + # ---------------------------------------------------------------------------
    1.27 + 
    1.28 + quiet_cmd_lzma = LZMA    $@
    1.29 +-cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
    1.30 ++cmd_lzma = (lzma e $< -so && $(size_append) $<) >$@ || (rm -f $@ ; false)