diff options
author | Shane Wang <shane.wang@intel.com> | 2012-01-22 14:53:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-24 11:54:23 +0000 |
commit | 1483a6c5d787353ec315a8e7cae7b8604cc7b23c (patch) | |
tree | 881b2adc684b3f567aa67efeb8d3340176d7e620 /meta/recipes-kernel/kexec/kexec-tools | |
parent | e36a3c16d504ed35f36556705b3e202d3abdbf44 (diff) | |
download | poky-1483a6c5d787353ec315a8e7cae7b8604cc7b23c.tar.gz |
kexec-tools: upgrade to 2.0.3
This patch is to upgrade kexec-tools to 2.0.3.
And since fix_for_compiling_with_gcc-4.6.0.patch is there in 2.0.3, it is removed.
(From OE-Core rev: aea75907ff0ad11b7a17910f74491278e55bbc10)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch b/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch deleted file mode 100644 index 658699b014..0000000000 --- a/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix following compiler warining/errors with gcc 4.6.0. | ||
4 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/09 | ||
5 | |||
6 | | kexec/kexec.c: In function 'my_exec': | ||
7 | | kexec/kexec.c:818:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] | ||
8 | |||
9 | | ccache i586-poky-linux-gcc -march=i586 --sysroot=/build_disk/poky_build/build_gcc_4.6.0/tmp/sysroots/qemux86 --no-undefined -nostartfiles -nostdlib -nodefaultlibs -e purgatory_start -r -o purgatory/purgatory.ro purgatory/purgatory.o purgatory/printf.o purgatory/string.o purgatory/arch/i386/entry32-16.o purgatory/arch/i386/entry32-16-debug.o purgatory/arch/i386/entry32.o purgatory/arch/i386/setup-x86.o purgatory/arch/i386/stack.o purgatory/arch/i386/compat_x86_64.o purgatory/arch/i386/purgatory-x86.o purgatory/arch/i386/console-x86.o purgatory/arch/i386/vga.o purgatory/arch/i386/pic.o purgatory/arch/i386/crashdump_backup.o purgatory/sha256.o | ||
10 | | i586-poky-linux-gcc: error: unrecognized option '--no-undefined' | ||
11 | | make: *** [purgatory/purgatory.ro] Error 1 | ||
12 | | ERROR: oe_runmake failed | ||
13 | |||
14 | |||
15 | Index: kexec-tools-2.0.2/kexec/kexec.c | ||
16 | =================================================================== | ||
17 | --- kexec-tools-2.0.2.orig/kexec/kexec.c | ||
18 | +++ kexec-tools-2.0.2/kexec/kexec.c | ||
19 | @@ -815,7 +815,7 @@ static int my_shutdown(void) | ||
20 | */ | ||
21 | static int my_exec(void) | ||
22 | { | ||
23 | - int result; | ||
24 | + int __attribute__((__unused__)) result; | ||
25 | |||
26 | result = kexec_reboot(); | ||
27 | /* I have failed if I make it here */ | ||
28 | Index: kexec-tools-2.0.2/purgatory/Makefile | ||
29 | =================================================================== | ||
30 | --- kexec-tools-2.0.2.orig/purgatory/Makefile | ||
31 | +++ kexec-tools-2.0.2/purgatory/Makefile | ||
32 | @@ -56,7 +56,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO | ||
33 | -I$(srcdir)/include \ | ||
34 | -I$(shell $(CC) -print-file-name=include) | ||
35 | $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ | ||
36 | - --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ | ||
37 | + -Wl,--no-undefined -nostartfiles -nostdlib -nodefaultlibs \ | ||
38 | -e purgatory_start -r | ||
39 | |||
40 | $(PURGATORY): $(PURGATORY_OBJS) | ||