[oe-commits] [meta-openembedded] 25/77: kexec-tools-klibc: remove unneeded x86-64 patch

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 005093bac5d84be258409ffbd4d3ec0859996e2f
Author: Andrea Adami <andrea.adami at gmail.com>
AuthorDate: Wed Sep 5 19:43:10 2018 +0200

    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 at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...4-purgatory-Makefile-remove-unknown-flags.patch | 35 ----------------------
 .../recipes-kernel/kexec/kexec-tools-klibc_git.bb  |  3 +-
 2 files changed, 1 insertion(+), 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 0ec880c..0000000
--- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86-64-purgatory-Makefile-remove-unknown-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9453599fd833794fb5d87cab2622de286144ed54 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami at gmail.com>
-Date: Wed, 18 Apr 2018 22:30:17 +0200
-Subject: [PATCH 6/6] purgatory: Makefile: remove unknown flags
-
-Fix
-
- x86_64-oe-linux-musl-ld: unrecognised emulation mode: cmodel=large
- Supported emulations: elf_x86_64 elf32_x86_64 elf_i386 elf_iamcu
-                       i386linux elf_l1om elf_k1om
- ../kexec-tools-2.0.17-rc1/purgatory/Makefile:67:
- recipe for target 'purgatory/purgatory.ro' failed
-
-Upstream-Status: Inappropriate [embedded specific]
-Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
-
----
- purgatory/arch/x86_64/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile
-index 7300937..73f6932 100644
---- a/purgatory/arch/x86_64/Makefile
-+++ b/purgatory/arch/x86_64/Makefile
-@@ -24,5 +24,5 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c
- x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c
- 
- ifeq ($(SUBARCH),64)
--        x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large
-+#        x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large
- endif
-
--- 
-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 4bbda4c..92ab7e6 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 \
                        file://x86_vfscanf.patch file://x86_kexec_test.patch"
 
 SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \
-                          file://x86_vfscanf.patch file://x86_kexec_test.patch \
-                          file://x86-64-purgatory-Makefile-remove-unknown-flags.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 \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.