wok-6.x view linux/stuff/linux-diff-2.6.25.5.u @ rev 3000

slim: Fix pre_install func to backup config file (Thanks firmit)
author Christophe Lincoln <pankso@slitaz.org>
date Mon May 11 21:44:31 2009 +0200 (2009-05-11)
parents
children
line source
1 --- linux-2.6.25.5/arch/x86/vdso/Makefile
2 +++ linux-2.6.25.5/arch/x86/vdso/Makefile
3 @@ -103,10 +103,12 @@
4 $(foreach H,$(filter-out FORCE,$^),\
5 if grep -q VDSO32_SYSENTER_RETURN $H; \
6 then diff -u $(@D)/.tmp_$(@F) $H; \
7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
8 - diff -u - $H; fi &&) : ;\
9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \
10 + $(@D)/.tmp_$(@F).$$ ; \
11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\
12 then mv -f $(@D)/.tmp_$(@F) $@; \
13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \
14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \
15 + rm -f $(@D)/.tmp_$(@F)*; \
16 fi
17 endef
18