summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-07-18 21:43:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-21 07:47:52 +0100
commit56aa9c8162952d150bad35fb980767297c0208cb (patch)
tree4bea08abf7c42dfabe50f78f4acd09ba0a9c1295 /meta
parent2d5b282957680828dab15dc00c33056e6011f4e0 (diff)
downloadpoky-56aa9c8162952d150bad35fb980767297c0208cb.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.24.bb2
-rw-r--r--meta/recipes-core/glibc/glibc/elf-meta.patch32
-rw-r--r--meta/recipes-core/glibc/glibc_2.24.bb3
3 files changed, 2 insertions, 35 deletions
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
index 104e38bceb..650c6c3013 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
@@ -22,7 +22,7 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
22SRCBRANCH ?= "master" 22SRCBRANCH ?= "master"
23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
24 24
25SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b" 25SRCREV_glibc ?= "d957c4d3fa48d685ff2726c605c988127ef99395"
26SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71" 26SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71"
27 27
28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
diff --git a/meta/recipes-core/glibc/glibc/elf-meta.patch b/meta/recipes-core/glibc/glibc/elf-meta.patch
deleted file mode 100644
index fab66d79c4..0000000000
--- a/meta/recipes-core/glibc/glibc/elf-meta.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Pending
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From a495656665cd4a4f97744741a4741eafa621d65b Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 11 Jul 2016 16:57:38 +0100
7Subject: [PATCH] elf.h: add relocations for Imagination META
8
9Adding EM_METAG but not the relocations means the kernel doesn't compile as it
10guards its own declarations on the presence of EM_METAG.
11---
12 elf/elf.h | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/elf/elf.h b/elf/elf.h
16index b6112d9..69e85a7 100644
17--- a/elf/elf.h
18+++ b/elf/elf.h
19@@ -3677,6 +3677,10 @@ enum
20
21 #define R_TILEGX_NUM 130
22
23+/* Imagination META relocs */
24+#define R_METAG_ADDR32 2
25+#define R_METAG_NONE 3
26+
27 /* BPF specific declarations. */
28
29 #define R_BPF_NONE 0 /* No reloc */
30--
312.8.1
32
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb
index 4bc64434ad..f023272434 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
7 7
8DEPENDS += "gperf-native" 8DEPENDS += "gperf-native"
9 9
10SRCREV ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b" 10SRCREV ?= "d957c4d3fa48d685ff2726c605c988127ef99395"
11 11
12#SRCBRANCH ?= "release/${PV}/master" 12#SRCBRANCH ?= "release/${PV}/master"
13SRCBRANCH ?= "master" 13SRCBRANCH ?= "master"
@@ -37,7 +37,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
37 file://0023-eglibc-Install-PIC-archives.patch \ 37 file://0023-eglibc-Install-PIC-archives.patch \
38 file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ 38 file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \
39 file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ 39 file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \
40 file://elf-meta.patch \
41" 40"
42 41
43SRC_URI += "\ 42SRC_URI += "\