From patchwork Tue Jul 19 04:43:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 72264 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp467952qga; Mon, 18 Jul 2016 21:43:41 -0700 (PDT) X-Received: by 10.98.152.6 with SMTP id q6mr51845457pfd.86.1468903421077; Mon, 18 Jul 2016 21:43:41 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id qd10si30613137pac.96.2016.07.18.21.43.40; Mon, 18 Jul 2016 21:43:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D786B70100; Tue, 19 Jul 2016 04:43:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 5267360589 for ; Tue, 19 Jul 2016 04:43:13 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id y134so577273pfg.3 for ; Mon, 18 Jul 2016 21:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=8U1eZrvx+vxL7F+NhRrp+4qxR+8res1bV2FopKLhslc=; b=D6ayvLzSmBvkhQ5WRwVZetDzVk4krxr/SyAdK+Y+oVJlKu56+Fqzw5izjNTuWjb407 QkxmQ28c6FdHc90n2fOmXJNbrXT95VCVIQ/O1GiMsmyEnyoWaV7F1zXJhuL6t9SsU9Fc gzoeG0UuCBWUCMGelilgXLD+B38z5G0KcA7NrzZYQo72m3DY6If7W/lhh3+ZtZmLlk2Z Q/Hy6pbqSfjQNhXcfa3/qAkoky2kpRLC4xpavblKK8N02A2Akb726BjUoK5Gihv1FDc+ HaT9yWh38uhihygIhVdtOlnP0b55oRL77RRoUqXZv8nSRCLLnO/qkwgW71U7XNiK17JE W3fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8U1eZrvx+vxL7F+NhRrp+4qxR+8res1bV2FopKLhslc=; b=a4K8u8g6yWsruUmDG39PWKGqJWNjtgPkNVlOieY/BmcQBGHDxXH/Dr7aKaC1MBVMxa frSz6SHTkSRAi4MjDyhl8nRY66DqetkWJ6KIH4MFAlIaImgDXnYQMlNBvIFc378z6G8l MNwEvLUEmTxKFa0tFVsPQIvXQnFYwmmsKoi1kfOWrfeU5pMo8XZP2x1eE0nKKKzWxqcY /5ris6l8OZLedvPP2Xd5EQLXce2luSmjGgovv5lfj1PqgKJsGWks0bUwYvelB7Zx1oEc 3dg+FmjSPxX9MGi3wQekMRdyGvJPjHOxdGFEVkYMZjnZlfYCx5LFlMrrgjxodf5uy/iG YZnQ== X-Gm-Message-State: ALyK8tKCizOO0DukmyZgfMEgFuU0/orkjRWHLjaep7xHKuQopGcEEJzeeaC7r4e1VIhjew== X-Received: by 10.98.87.138 with SMTP id i10mr47622113pfj.16.1468903394327; Mon, 18 Jul 2016 21:43:14 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id i137sm775514pfe.64.2016.07.18.21.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jul 2016 21:43:13 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 18 Jul 2016 21:43:07 -0700 Message-Id: <20160719044307.16219-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.9.0 Subject: [OE-core] [PATCH] glibc: Update to 2.24 after hard-freeze X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Drop upstreamed patch Signed-off-by: Khem Raj --- .../glibc/cross-localedef-native_2.24.bb | 2 +- meta/recipes-core/glibc/glibc/elf-meta.patch | 32 ---------------------- meta/recipes-core/glibc/glibc_2.24.bb | 3 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-core/glibc/glibc/elf-meta.patch -- 2.9.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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 104e38b..650c6c3 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" SRCBRANCH ?= "master" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" -SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b" +SRCREV_glibc ?= "d957c4d3fa48d685ff2726c605c988127ef99395" SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71" SRC_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 fab66d7..0000000 --- a/meta/recipes-core/glibc/glibc/elf-meta.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Ross Burton - -From a495656665cd4a4f97744741a4741eafa621d65b Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 - diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb index 456f206..03773c7 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 \ 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 += "\