wok-6.x view linux/stuff/linux-diff-2.6.30.6.u @ rev 4545
busybox/init: add loop & crypto support
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Dec 03 17:58:06 2009 +0100 (2009-12-03) |
| parents | |
| children |
line source
1 --- linux-2.6.30.3/arch/x86/vdso/Makefile
2 +++ linux-2.6.30.3/arch/x86/vdso/Makefile
3 @@ -104,10 +104,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
20 --- linux-2.6.30.3/scripts/Makefile.lib
21 +++ linux-2.6.30.3/scripts/Makefile.lib
22 @@ -204,4 +204,4 @@
23 # ---------------------------------------------------------------------------
25 quiet_cmd_lzma = LZMA $@
26 -cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
27 +cmd_lzma = (lzma e $< -so && $(size_append) $<) >$@ || (rm -f $@ ; false)