mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
glibc: Update to 2.24 after hard-freeze
Drop upstreamed patch (From OE-Core rev: 96f951af74dd8dcea1372249fb84c2c615a7bba3) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -22,7 +22,7 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
|
||||
SRCBRANCH ?= "master"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
|
||||
|
||||
SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
|
||||
SRCREV_glibc ?= "d957c4d3fa48d685ff2726c605c988127ef99395"
|
||||
SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71"
|
||||
|
||||
SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From a495656665cd4a4f97744741a4741eafa621d65b Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Mon, 11 Jul 2016 16:57:38 +0100
|
||||
Subject: [PATCH] elf.h: add relocations for Imagination META
|
||||
|
||||
Adding EM_METAG but not the relocations means the kernel doesn't compile as it
|
||||
guards its own declarations on the presence of EM_METAG.
|
||||
---
|
||||
elf/elf.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/elf/elf.h b/elf/elf.h
|
||||
index b6112d9..69e85a7 100644
|
||||
--- a/elf/elf.h
|
||||
+++ b/elf/elf.h
|
||||
@@ -3677,6 +3677,10 @@ enum
|
||||
|
||||
#define R_TILEGX_NUM 130
|
||||
|
||||
+/* Imagination META relocs */
|
||||
+#define R_METAG_ADDR32 2
|
||||
+#define R_METAG_NONE 3
|
||||
+
|
||||
/* BPF specific declarations. */
|
||||
|
||||
#define R_BPF_NONE 0 /* No reloc */
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
|
||||
|
||||
DEPENDS += "gperf-native"
|
||||
|
||||
SRCREV ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
|
||||
SRCREV ?= "d957c4d3fa48d685ff2726c605c988127ef99395"
|
||||
|
||||
#SRCBRANCH ?= "release/${PV}/master"
|
||||
SRCBRANCH ?= "master"
|
||||
@@ -37,7 +37,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
|
||||
file://0023-eglibc-Install-PIC-archives.patch \
|
||||
file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
|
||||
file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
|
||||
file://elf-meta.patch \
|
||||
"
|
||||
|
||||
SRC_URI += "\
|
||||
|
||||
Reference in New Issue
Block a user