summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch40
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb3
2 files changed, 42 insertions, 1 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
new file mode 100644
index 0000000000..658699b014
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch
@@ -0,0 +1,40 @@
1Upstream-Status: Pending
2
3Fix following compiler warining/errors with gcc 4.6.0.
4Nitin 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
15Index: 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 */
28Index: 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)
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb
index 0d15b5b862..caed8160e2 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb
@@ -2,7 +2,8 @@ require kexec-tools.inc
2export LDFLAGS = "-L${STAGING_LIBDIR}" 2export LDFLAGS = "-L${STAGING_LIBDIR}"
3EXTRA_OECONF = " --with-zlib=yes" 3EXTRA_OECONF = " --with-zlib=yes"
4 4
5PR = "r0" 5PR = "r1"
6 6
7SRC_URI += " file://fix_for_compiling_with_gcc-4.6.0.patch"
7SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91" 8SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91"
8SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188" 9SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188"