wok-current view linux/stuff/linux-diff.u @ rev 13797

Create grub entry based on current root partition. Fix bug78
author border
date Sat Jan 05 12:34:10 2013 -0500 (2013-01-05)
parents
children 16c0bac038bf
line source
1 --- linux-2.6.30.6/arch/x86/vdso/Makefile
2 +++ linux-2.6.30.6/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
18
19
20 --- linux-2.6.34/scripts/Makefile.lib
21 +++ linux-2.6.34/scripts/Makefile.lib
22 @@ -204,7 +204,8 @@
23 # ---------------------------------------------------------------------------
24
25 quiet_cmd_gzip = GZIP $@
26 -cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
27 +cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) && \
28 + ( which advdef > /dev/null && advdef -z $@ ; true ) || \
29 (rm -f $@ ; false)
30
31
32 @@ -253,7 +254,7 @@
33
34 quiet_cmd_lzma = LZMA $@
35 cmd_lzma = (cat $(filter-out FORCE,$^) | \
36 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
37 + lzma e -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
38 (rm -f $@ ; false)
39
40 quiet_cmd_lzo = LZO $@