aboutsummaryrefslogtreecommitdiffstats
path: root/meta-initramfs
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2018-09-05 23:32:20 +0200
committerKhem Raj <raj.khem@gmail.com>2018-09-06 10:38:06 -0700
commit47544dbdea0f65febede7afe06cfcf108a994b37 (patch)
treefa211c8f589fc70d72b35c6652605bf03d1187ff /meta-initramfs
parent3798321fc902148af073200ea39903ef1b415c5c (diff)
downloadmeta-openembedded-47544dbdea0f65febede7afe06cfcf108a994b37.tar.gz
kexec-tools-klibc: remove unneeded aarch64 patch
Remove temporary development leftover (hack). Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs')
-rw-r--r--meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch51
-rw-r--r--meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb3
2 files changed, 1 insertions, 53 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch
deleted file mode 100644
index f87f4334d7..0000000000
--- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_purgatory-Makefile-remove-unknown-flags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1ceca8645dbe2780e1b8993c80de772993fe3053 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Thu, 19 Apr 2018 10:43:34 +0200
-Subject: [PATCH 1/2] purgatory/arm64: Makefile: remove unknown flags for arm64
-
-Fix
-
- | aarch64-oe-linux-musl-ld: unrecognised emulation mode: cmodel=large
- | Supported emulations: aarch64linux aarch64elf aarch64elf32
- aarch64elf32b aarch64elfb armelf armelfb aarch64linuxb aarch64linux32
- aarch64linux32b armelfb_linux_eabi armelf_linux_eabi
-
-Upstream-Status: Inappropriate [klibc specific]
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
----
- purgatory/arch/arm64/Makefile | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile
-index 636abea..ddc9461 100644
---- a/purgatory/arch/arm64/Makefile
-+++ b/purgatory/arch/arm64/Makefile
-@@ -1,13 +1,13 @@
-
--arm64_PURGATORY_EXTRA_CFLAGS = \
-- -mcmodel=large \
-- -fno-PIC \
-- -fno-stack-protector \
-- -fno-asynchronous-unwind-tables \
-- -Wundef \
-- -Werror-implicit-function-declaration \
-- -Wdeclaration-after-statement \
-- -Werror=implicit-int \
-- -Werror=strict-prototypes
-+#arm64_PURGATORY_EXTRA_CFLAGS = \
-+# -mcmodel=large \
-+# -fno-PIC \
-+# -fno-stack-protector \
-+# -fno-asynchronous-unwind-tables \
-+# -Wundef \
-+# -Werror-implicit-function-declaration \
-+# -Wdeclaration-after-statement \
-+# -Werror=implicit-int \
-+# -Werror=strict-prototypes
-
- arm64_PURGATORY_SRCS += \
- purgatory/arch/arm64/entry.S \
---
-2.7.4
-
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 92ab7e615a..fe34671987 100644
--- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb
+++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb
@@ -48,8 +48,7 @@ SRC_URI_append_x86 = " file://x86_sys_io.patch file://x86_basename.patch \
SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \
file://x86_vfscanf.patch file://x86_kexec_test.patch"
-SRC_URI_append_aarch64 = " file://arm64_purgatory-Makefile-remove-unknown-flags.patch \
- file://arm64_kexec-image-header.h-add-missing-le64toh.patch \
+SRC_URI_append_aarch64 = " file://arm64_kexec-image-header.h-add-missing-le64toh.patch \
file://arm64-crashdump-arm64.c-fix-warning.patch \
file://arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch"