This reverts commit d7975a7f09399828b930663aea7b307c51e7e419. --- meta/recipes-core/eglibc/eglibc_2.18.bb | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb index 371bd0a..15e5eed 100644 --- a/meta/recipes-core/eglibc/eglibc_2.18.bb +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb @@ -146,10 +146,4 @@ do_compile () {

require eglibc-package.inc

-# Workaround fix to avoid init crash -do_install_append () { - ln -sf lib ${D}/lib64 -} -FILES_${PN} += " /lib64 " - BBCLASSEXTEND = "nativesdk"

Signed-off-by: Graeme Gregory graeme.gregory@linaro.org --- meta-luv/recipes-core/fwts/fwts_git.bb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/meta-luv/recipes-core/fwts/fwts_git.bb b/meta-luv/recipes-core/fwts/fwts_git.bb index 05dd235..3494882 100644 --- a/meta-luv/recipes-core/fwts/fwts_git.bb +++ b/meta-luv/recipes-core/fwts/fwts_git.bb @@ -4,19 +4,11 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f"

-PV = "14.03.01+git${SRCPV}" +PV = "14.12.00+git${SRCPV}"

-SRCREV = "8ec44dc1e55ecf334f4afa8eed8795ed5776c396" +SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69" SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ file://luv-parser-fwts \ - file://0001-efi_runtime-Set-default-value-for-KVER.patch \ - file://0002-efi_runtime-Refactor-ioctl-code-into-helper-function.patch \ - file://0003-efi_runtime-Group-kernel-version-dependent-functions.patch \ - file://0004-efi_runtime-Do-not-pass-user-addresses-to-firmware.patch \ - file://0005-efi_runtime-donot-dereference-user-address.patch \ - file://0006-cpu-microcode-remove-failures-when-kernel-does-not-h.patch \ - file://0007-securebootcert-report-info-instead-of-failure-for-mi.patch \ - file://0008-efi_runtime-Don-t-use-get_user-on-non-pointer.patch \ "

S = "${WORKDIR}/git" @@ -25,6 +17,8 @@ DEPENDS = "autoconf automake libtool libpcre libjson flex bison \

inherit autotools luv-test module-base

+CFLAGS += "-I${STAGING_INCDIR}/json" + do_unpack[depends] += "virtual/kernel:do_populate_sysroot"

do_compile_append() {

Applied.

Thanks -Naresh

On 24 December 2014 at 17:12, Graeme Gregory graeme.gregory@linaro.org wrote:

This reverts commit d1977a6b7f7555fea4f328efbb0be6c590472030.

Conflicts: meta/recipes-devtools/gcc/gcc-4.8.inc

---

meta/recipes-devtools/gcc/gcc-4.8.inc | 1 - .../gcc/gcc-4.8/redefine-dynamic-linker-for-aarch64.patch | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.8/redefine-dynamic-linker-for-aarch64.patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 1e0c6d4..69a7449 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc @@ -77,7 +77,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0045-gcc-4.8-PR57717-PowerPC-E500v2.patch \ file://0046-libatomic-deptracking.patch \ file://0047-repomembug.patch \

•       file://redefine-dynamic-linker-for-aarch64.patch \
        file://use-lib-for-aarch64.patch \
      "
  

SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304" diff --git a/meta/recipes-devtools/gcc/gcc-4.8/redefine-dynamic-linker-for-aarch64.patch b/meta/recipes-devtools/gcc/gcc-4.8/redefine-dynamic-linker-for-aarch64.patch deleted file mode 100644 index 3b49f63..0000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/redefine-dynamic-linker-for-aarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -21,7 +21,7 @@

• #ifndef GCC_AARCH64_LINUX_H
• #define GCC_AARCH64_LINUX_H

--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib64/ld-linux-aarch64%{mbig-endian:_be}.so.1"

• #define LINUX_TARGET_LINK_SPEC "%{h*} \
• %{static:-Bstatic} \

-- 1.9.1