summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kexec
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-01-22 14:53:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:23 +0000
commit1483a6c5d787353ec315a8e7cae7b8604cc7b23c (patch)
tree881b2adc684b3f567aa67efeb8d3340176d7e620 /meta/recipes-kernel/kexec
parente36a3c16d504ed35f36556705b3e202d3abdbf44 (diff)
downloadpoky-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')
-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.bb14
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.3.bb13
3 files changed, 13 insertions, 54 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 @@
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
deleted file mode 100644
index 8d2e606076..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require kexec-tools.inc
2export LDFLAGS = "-L${STAGING_LIBDIR}"
3EXTRA_OECONF = " --with-zlib=yes"
4
5PR = "r2"
6
7SRC_URI += " file://fix_for_compiling_with_gcc-4.6.0.patch"
8SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91"
9SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188"
10
11PACKAGES =+ "kexec kdump"
12
13FILES_kexec = "${sbindir}/kexec"
14FILES_kdump = "${sbindir}/kdump"
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.3.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.3.bb
new file mode 100644
index 0000000000..3cc8265609
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.3.bb
@@ -0,0 +1,13 @@
1require kexec-tools.inc
2export LDFLAGS = "-L${STAGING_LIBDIR}"
3EXTRA_OECONF = " --with-zlib=yes"
4
5PR = "r0"
6
7SRC_URI[md5sum] = "1b362abd2e8669171a5ba50a9cc26183"
8SRC_URI[sha256sum] = "36a50fad961e24c9cdaa7c01b74d3cdd2b1bebf9bf0f0f3740dd1f21bd1b8ba6"
9
10PACKAGES =+ "kexec kdump"
11
12FILES_kexec = "${sbindir}/kexec"
13FILES_kdump = "${sbindir}/kdump"