wok annotate linux/stuff/linux-diff-2.6.36.u @ rev 7660

Up: postfix to 2.7.2.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Dec 15 20:54:26 2010 +0000 (2010-12-15)
parents
children
rev   line source
slaxemulator@7131 1 --- linux-2.6.30.6/arch/x86/vdso/Makefile
slaxemulator@7131 2 +++ linux-2.6.30.6/arch/x86/vdso/Makefile
slaxemulator@7131 3 @@ -104,10 +104,12 @@
slaxemulator@7131 4 $(foreach H,$(filter-out FORCE,$^),\
slaxemulator@7131 5 if grep -q VDSO32_SYSENTER_RETURN $H; \
slaxemulator@7131 6 then diff -u $(@D)/.tmp_$(@F) $H; \
slaxemulator@7131 7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
slaxemulator@7131 8 - diff -u - $H; fi &&) : ;\
slaxemulator@7131 9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \
slaxemulator@7131 10 + $(@D)/.tmp_$(@F).$$ ; \
slaxemulator@7131 11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\
slaxemulator@7131 12 then mv -f $(@D)/.tmp_$(@F) $@; \
slaxemulator@7131 13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \
slaxemulator@7131 14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \
slaxemulator@7131 15 + rm -f $(@D)/.tmp_$(@F)*; \
slaxemulator@7131 16 fi
slaxemulator@7131 17 endef
slaxemulator@7131 18
slaxemulator@7131 19
slaxemulator@7131 20 --- linux-2.6.34/scripts/Makefile.lib
slaxemulator@7131 21 +++ linux-2.6.34/scripts/Makefile.lib
slaxemulator@7131 22 @@ -204,7 +204,8 @@
slaxemulator@7131 23 # ---------------------------------------------------------------------------
slaxemulator@7131 24
slaxemulator@7131 25 quiet_cmd_gzip = GZIP $@
slaxemulator@7131 26 -cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
slaxemulator@7131 27 +cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) && \
slaxemulator@7131 28 + ( which advdef > /dev/null && advdef -z $@ ; true ) || \
slaxemulator@7131 29 (rm -f $@ ; false)
slaxemulator@7131 30
slaxemulator@7131 31
slaxemulator@7131 32 @@ -238,7 +239,7 @@
slaxemulator@7131 33
slaxemulator@7131 34 quiet_cmd_lzma = LZMA $@
slaxemulator@7131 35 cmd_lzma = (cat $(filter-out FORCE,$^) | \
slaxemulator@7131 36 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
slaxemulator@7131 37 + lzma e -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
slaxemulator@7131 38 (rm -f $@ ; false)
slaxemulator@7131 39
slaxemulator@7131 40 quiet_cmd_lzo = LZO $@