diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2018-09-05 19:43:10 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-05 13:59:16 -0700 |
commit | 005093bac5d84be258409ffbd4d3ec0859996e2f (patch) | |
tree | edf6fd559318ce98c29a14973369ec587168856f /meta-initramfs/recipes-kernel | |
parent | d1efc0181d5a2bcee3099a96d9b7f2c890029d87 (diff) | |
download | meta-openembedded-005093bac5d84be258409ffbd4d3ec0859996e2f.tar.gz |
kexec-tools-klibc: remove unneeded x86-64 patch
The issue with -mcmodel=large is already solved by the oe-core's patch
"kexec-x32.patch"
so we can remove this one.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-kernel')
-rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch | 35 | ||||
-rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch deleted file mode 100644 index 0ec880ca6..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 9453599fd833794fb5d87cab2622de286144ed54 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrea Adami <andrea.adami@gmail.com> | ||
3 | Date: Wed, 18 Apr 2018 22:30:17 +0200 | ||
4 | Subject: [PATCH 6/6] purgatory: Makefile: remove unknown flags | ||
5 | |||
6 | Fix | ||
7 | |||
8 | x86_64-oe-linux-musl-ld: unrecognised emulation mode: cmodel=large | ||
9 | Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu | ||
10 | i386linux elf_l1om elf_k1om | ||
11 | ../kexec-tools-2.0.17-rc1/purgatory/Makefile:67: | ||
12 | recipe for target 'purgatory/purgatory.ro' failed | ||
13 | |||
14 | Upstream-Status: Inappropriate [embedded specific] | ||
15 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | ||
16 | |||
17 | --- | ||
18 | purgatory/arch/x86_64/Makefile | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile | ||
22 | index 7300937..73f6932 100644 | ||
23 | --- a/purgatory/arch/x86_64/Makefile | ||
24 | +++ b/purgatory/arch/x86_64/Makefile | ||
25 | @@ -24,5 +24,5 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c | ||
26 | x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c | ||
27 | |||
28 | ifeq ($(SUBARCH),64) | ||
29 | - x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large | ||
30 | +# x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large | ||
31 | endif | ||
32 | |||
33 | -- | ||
34 | 2.7.4 | ||
35 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index 4bbda4c9e..92ab7e615 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb | |||
@@ -46,8 +46,7 @@ SRC_URI_append_x86 = " file://x86_sys_io.patch file://x86_basename.patch \ | |||
46 | file://x86_vfscanf.patch file://x86_kexec_test.patch" | 46 | file://x86_vfscanf.patch file://x86_kexec_test.patch" |
47 | 47 | ||
48 | SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \ | 48 | SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \ |
49 | file://x86_vfscanf.patch file://x86_kexec_test.patch \ | 49 | file://x86_vfscanf.patch file://x86_kexec_test.patch" |
50 | file://x86-64-purgatory-Makefile-remove-unknown-flags.patch" | ||
51 | 50 | ||
52 | SRC_URI_append_aarch64 = " file://arm64_purgatory-Makefile-remove-unknown-flags.patch \ | 51 | SRC_URI_append_aarch64 = " file://arm64_purgatory-Makefile-remove-unknown-flags.patch \ |
53 | file://arm64_kexec-image-header.h-add-missing-le64toh.patch \ | 52 | file://arm64_kexec-image-header.h-add-missing-le64toh.patch \ |