wok-stable annotate linux/stuff/linux-diff-2.6.33.2.u @ rev 5245

Up linux (2.6.33.2) With more modules and less patch
author Christophe Lincoln <pankso@slitaz.org>
date Sun Apr 11 19:23:48 2010 +0200 (2010-04-11)
parents
children 9385fa3a0f93
rev   line source
pankso@5245 1 --- linux-2.6.33.1/arch/x86/vdso/Makefile
pankso@5245 2 +++ linux-2.6.33.1/arch/x86/vdso/Makefile
pankso@5245 3 @@ -104,10 +104,12 @@
pankso@5245 4 $(foreach H,$(filter-out FORCE,$^),\
pankso@5245 5 if grep -q VDSO32_SYSENTER_RETURN $H; \
pankso@5245 6 then diff -u $(@D)/.tmp_$(@F) $H; \
pankso@5245 7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
pankso@5245 8 - diff -u - $H; fi &&) : ;\
pankso@5245 9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \
pankso@5245 10 + $(@D)/.tmp_$(@F).$$ ; \
pankso@5245 11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\
pankso@5245 12 then mv -f $(@D)/.tmp_$(@F) $@; \
pankso@5245 13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \
pankso@5245 14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \
pankso@5245 15 + rm -f $(@D)/.tmp_$(@F)*; \
pankso@5245 16 fi
pankso@5245 17 endef
pankso@5245 18
pankso@5245 19
pankso@5245 20 --- linux-2.6.33.1/scripts/Makefile.lib
pankso@5245 21 +++ linux-2.6.33.1/scripts/Makefile.lib
pankso@5245 22 @@ -238,7 +238,7 @@
pankso@5245 23
pankso@5245 24 quiet_cmd_lzma = LZMA $@
pankso@5245 25 cmd_lzma = (cat $(filter-out FORCE,$^) | \
pankso@5245 26 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
pankso@5245 27 + lzma e -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
pankso@5245 28 (rm -f $@ ; false)
pankso@5245 29
pankso@5245 30 quiet_cmd_lzo = LZO $@