wok diff linux/stuff/linux-diff-2.6.25.5.u @ rev 957
syslinux: update tools/slitaz.html
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Jun 28 06:28:34 2008 +0000 (2008-06-28) |
| 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.25.5.u Sat Jun 28 06:28:34 2008 +0000 1.3 @@ -0,0 +1,18 @@ 1.4 +--- linux-2.6.25.5/arch/x86/vdso/Makefile 1.5 ++++ linux-2.6.25.5/arch/x86/vdso/Makefile 1.6 +@@ -103,10 +103,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 +