summaryrefslogtreecommitdiffstats
path: root/meta-initramfs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-initramfs')
-rw-r--r--meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch35
-rw-r--r--meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb3
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 @@
1From 9453599fd833794fb5d87cab2622de286144ed54 Mon Sep 17 00:00:00 2001
2From: Andrea Adami <andrea.adami@gmail.com>
3Date: Wed, 18 Apr 2018 22:30:17 +0200
4Subject: [PATCH 6/6] purgatory: Makefile: remove unknown flags
5
6Fix
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
14Upstream-Status: Inappropriate [embedded specific]
15Signed-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
21diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile
22index 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--
342.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
48SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \ 48SRC_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
52SRC_URI_append_aarch64 = " file://arm64_purgatory-Makefile-remove-unknown-flags.patch \ 51SRC_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 \