wok
annotate linux-libre/stuff/linux-libre-diff-2.6.37-gnu.u @ rev 19018
Up mirror-tools, qemu-box, slitaz-mercurial-style, tazchroot, tazdev, tazwikiss, yaff (253)
author |
Pascal Bellard <pascal.bellard@slitaz.org> |
date |
Fri Apr 01 10:49:53 2016 +0200 (2016-04-01) |
parents |
|
children |
|
rev |
line source |
pascal@14201
|
1 --- linux-2.6.30.6/arch/x86/vdso/Makefile
|
pascal@14201
|
2 +++ linux-2.6.30.6/arch/x86/vdso/Makefile
|
pascal@14201
|
3 @@ -104,10 +104,12 @@
|
pascal@14201
|
4 $(foreach H,$(filter-out FORCE,$^),\
|
pascal@14201
|
5 if grep -q VDSO32_SYSENTER_RETURN $H; \
|
pascal@14201
|
6 then diff -u $(@D)/.tmp_$(@F) $H; \
|
pascal@14201
|
7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
|
pascal@14201
|
8 - diff -u - $H; fi &&) : ;\
|
pascal@14201
|
9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \
|
pascal@14201
|
10 + $(@D)/.tmp_$(@F).$$ ; \
|
pascal@14201
|
11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\
|
pascal@14201
|
12 then mv -f $(@D)/.tmp_$(@F) $@; \
|
pascal@14201
|
13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \
|
pascal@14201
|
14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \
|
pascal@14201
|
15 + rm -f $(@D)/.tmp_$(@F)*; \
|
pascal@14201
|
16 fi
|
pascal@14201
|
17 endef
|
pascal@14201
|
18
|
pascal@14201
|
19
|
pascal@14201
|
20 --- linux-2.6.34/scripts/Makefile.lib
|
pascal@14201
|
21 +++ linux-2.6.34/scripts/Makefile.lib
|
pascal@14201
|
22 @@ -204,7 +204,8 @@
|
pascal@14201
|
23 # ---------------------------------------------------------------------------
|
pascal@14201
|
24
|
pascal@14201
|
25 quiet_cmd_gzip = GZIP $@
|
pascal@14201
|
26 -cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
|
pascal@14201
|
27 +cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) && \
|
pascal@14201
|
28 + ( which advdef > /dev/null && advdef -z $@ ; true ) || \
|
pascal@14201
|
29 (rm -f $@ ; false)
|
pascal@14201
|
30
|
pascal@14201
|
31
|
pascal@14201
|
32 @@ -238,7 +239,7 @@
|
pascal@14201
|
33
|
pascal@14201
|
34 quiet_cmd_lzma = LZMA $@
|
pascal@14201
|
35 cmd_lzma = (cat $(filter-out FORCE,$^) | \
|
pascal@14201
|
36 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
|
pascal@14201
|
37 + lzma e -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
|
pascal@14201
|
38 (rm -f $@ ; false)
|
pascal@14201
|
39
|
pascal@14201
|
40 quiet_cmd_lzo = LZO $@
|