Skip to contentSkip to conversation

uclibc and eglibc update

PATCH Applied Khem Raj 2 participants 5 messages Aug 30, 2012 – Sep 4, 2012

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

cover uclibc and eglibc update

get some bugfixes for eglibc
Move uclibc git recipes to latest git create patch for updating mount.h needed for systemd to work

Fix elfutils build on uclibc

The following changes since commit 5bc4c0593997b046300a8f5b3f63c278aeb31d68:

gail: remove (2012-08-29 14:14:13 -0700)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib kraj/misc-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes

Khem Raj (3):
uclibc-git: Move to tip of master and sync mount.h
eglibc: Bring in the fix for glibc bug #14459, #14195
elfutils: Fix build on uclibc

 .../eglibc/eglibc-2.16/rpc-bootstrap.patch         |   63 ---------------
 meta/recipes-core/eglibc/eglibc_2.16.bb            |    3 +-
 meta/recipes-core/uclibc/uclibc-git.inc            |    5 +-
 .../uclibc/uclibc-git/mount.h-update.patch         |   83 ++++++++++++++++++++
 meta/recipes-core/uclibc/uclibc_git.bb             |    2 -
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    8 +-
 6 files changed, 91 insertions(+), 73 deletions(-)
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/3 uclibc-git: Move to tip of master and sync mount.h

mount.h sync with glibc is needed to get new defines which are needed for some packages like systemd

---
 meta/recipes-core/uclibc/uclibc-git.inc            |    5 +-
 .../uclibc/uclibc-git/mount.h-update.patch         |   83 ++++++++++++++++++++
 meta/recipes-core/uclibc/uclibc_git.bb             |    2 -
 3 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch
meta/recipes-core/uclibc/uclibc-git.inc +3 -2
index 60d36f4..eec4ded 100644
@@ -1,9 +1,9 @@
-SRCREV="0dcc13bf7a61b1d0708e5dd103d5515e0ffec79a"
+SRCREV="555ae2e88cd16a83f854634b6c3f35715b11d3d4"
 
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.9.33+git${SRCPV}"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
 
@@ -25,5 +25,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
 	file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \
 	file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
 	file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
+	file://mount.h-update.patch \
 	"
 S = "${WORKDIR}/git"
meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch new file +83 -0

83 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc_git.bb +0 -2
index 2a60947..e8a6d68 100644
@@ -1,5 +1,3 @@
-SRCREV="0dcc13bf7a61b1d0708e5dd103d5515e0ffec79a"
-
 require uclibc.inc
 require uclibc-package.inc
 require uclibc-git.inc
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/3 eglibc: Bring in the fix for glibc bug #14459, #14195

Fixes strtod integer/buffer overflow bug as detailed below

http://sourceware.org/ml/libc-alpha/2012-08/msg00202.html

Remove rpc-bootstrap patch since its already applied upstream 2.16 branch

---
 .../eglibc/eglibc-2.16/rpc-bootstrap.patch         |   63 --------------------
 meta/recipes-core/eglibc/eglibc_2.16.bb            |    3 +-
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch
meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch deleted +0 -63
deleted file mode 100644
index 130a816..0000000
@@ -1,63 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
-
-From libc-alpha-return-31199-listarch-libc-alpha=sources dot redhat dot com at sourceware dot org Tue Jul 03 19:54:27 2012
-Return-Path: <libc-alpha-return-31199-listarch-libc-alpha=sources dot redhat dot com at sourceware dot org>
-Delivered-To: listarch-libc-alpha at sources dot redhat dot com
-Received: (qmail 20151 invoked by alias); 3 Jul 2012 19:54:25 -0000
-Received: (qmail 20139 invoked by uid 22791); 3 Jul 2012 19:54:23 -0000
-X-SWARE-Spam-Status: No, hits=-4.8 required=5.0
-	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,T_RP_MATCHES_RCVD
-X-Spam-Check-By: sourceware.org
-From: Mike Frysinger <vapier at gentoo dot org>
-To: libc-alpha at sourceware dot org
-Subject: [PATCH] sunrpc: fix rpc bootstrap builds
-Date: Tue,  3 Jul 2012 15:54:11 -0400
-Message-Id: <[email protected]>
-Mailing-List: contact libc-alpha-help at sourceware dot org; run by ezmlm
-Precedence: bulk
-List-Id: <libc-alpha.sourceware.org>
-List-Subscribe: <mailto:libc-alpha-subscribe at sourceware dot org>
-List-Archive: <http://sourceware.org/ml/libc-alpha/>
-List-Post: <mailto:libc-alpha at sourceware dot org>
-List-Help: <mailto:libc-alpha-help at sourceware dot org>, <http://sourceware dot org/ml/#faqs>
-Sender: libc-alpha-owner at sourceware dot org
-Delivered-To: mailing list libc-alpha at sourceware dot org
-
-If you build & install glibc w/rpc disabled, you no longer have headers in
-/usr/include/rpc/ (this is expected).  But if you try to build glibc w/rpc
-enabled, this gets into a bad state due to the new rpc helpers that get
-cross-compiled:
-
-$ make
-...
-x86_64-pc-linux-gnu-gcc -m32   -D_RPC_THREAD_SAFE_ -D_GNU_SOURCE -DIS_IN_build \
-	-include $objdir/config.h rpc_clntout.c -o $objdir/sunrpc/cross-rpc_clntout.o \
-	-MMD -MP -MF $objdir/sunrpc/cross-rpc_clntout.o.dt -MT $objdir/sunrpc/cross-rpc_clntout.o -c
-rpc_clntout.c:34:23: fatal error: rpc/types.h: No such file or directory
-compilation terminated.
-make: *** [$objdir/sunrpc/cross-rpc_clntout.o] Error 1
-
-Signed-off-by: Mike Frysinger <[email protected]>
-
-2012-07-03  Mike Frysinger  <[email protected]>
-
-	* sunrpc/rpc_clntout.c: Change <rpc/types.h> to "rpc/types.h".
----
- sunrpc/rpc_clntout.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libc/sunrpc/rpc_clntout.c
-===================================================================
---- libc.orig/sunrpc/rpc_clntout.c	2012-07-04 16:09:16.000000000 -0700
-+++ libc/sunrpc/rpc_clntout.c	2012-07-04 18:04:34.498085075 -0700
-@@ -31,7 +31,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
--#include <rpc/types.h>
-+#include "rpc/types.h"
- #include "rpc_parse.h"
- #include "rpc_util.h"
- #include "proto.h"
meta/recipes-core/eglibc/eglibc_2.16.bb +1 -2
index 69803f7..3b11892 100644
@@ -1,6 +1,6 @@
 require eglibc.inc
 
-SRCREV = "19922"
+SRCREV = "20393"
 
 DEPENDS += "gperf-native"
 PR = "r6"
@@ -21,7 +21,6 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=h
            file://initgroups_keys.patch \
            file://eglibc_fix_findidx_parameters.patch \
            file://ppc_slow_ieee754_sqrt.patch \
-           file://rpc-bootstrap.patch \
            file://e500-math_private.patch \
            file://fileops-without-wchar-io.patch \
            file://add_resource_h_to_wait_h.patch \
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/3 elfutils: Fix build on uclibc

In reply to Khem Raj

It depends on libintl so add virtual/libintl to DEPENDS simplify the overridden statements

---
 meta/recipes-devtools/elfutils/elfutils_0.148.bb |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/elfutils/elfutils_0.148.bb +4 -4
index 90bc308..5d45f3a 100644
@@ -4,9 +4,9 @@ SECTION = "base"
 LICENSE = "(GPL-2+ & Elfutils-Exception)"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3\
                     file://EXCEPTION;md5=570adcb0c1218ab57f2249c67d0ce417"
-DEPENDS = "libtool bzip2 zlib"
+DEPENDS = "libtool bzip2 zlib virtual/libintl"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"
 
@@ -33,7 +33,7 @@ SRC_URI += "\
 	file://dso-link-change.patch \
 "
 # Only apply when building uclibc based target recipe
-SRC_URI_append_libc-uclibc = " ${@['', 'file://uclibc-support.patch']['${PN}' == '${BPN}']}"
+SRC_URI_append_libc-uclibc = " file://uclibc-support.patch"
 
 # The buildsystem wants to generate 2 .h files from source using a binary it just built,
 # which can not pass the cross compiling, so let's work around it by adding 2 .h files
@@ -47,7 +47,7 @@ inherit autotools gettext
 
 EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
 EXTRA_OECONF_append_virtclass-native = " --without-bzlib"
-EXTRA_OECONF_append_libc-uclibc = " ${@['', '--enable-uclibc']['${PN}' == '${BPN}']}"
+EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc"
 
 do_configure_prepend() {
 	sed -i 's:./i386_gendis:echo\ \#:g' ${S}/libcpu/Makefile.am
Signature · 1 line
1.7.9.5
Applied
#4 lore raw
In reply to Khem Raj
Quoted 29 lines · Khem Raj

get some bugfixes for eglibc
Move uclibc git recipes to latest git create patch for updating mount.h needed for systemd to work

Fix elfutils build on uclibc

The following changes since commit 5bc4c0593997b046300a8f5b3f63c278aeb31d68:

   gail: remove (2012-08-29 14:14:13 -0700)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib kraj/misc-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes

Khem Raj (3):
uclibc-git: Move to tip of master and sync mount.h
eglibc: Bring in the fix for glibc bug #14459, #14195
elfutils: Fix build on uclibc

  .../eglibc/eglibc-2.16/rpc-bootstrap.patch         |   63 ---------------
  meta/recipes-core/eglibc/eglibc_2.16.bb            |    3 +-
  meta/recipes-core/uclibc/uclibc-git.inc            |    5 +-
  .../uclibc/uclibc-git/mount.h-update.patch         |   83 ++++++++++++++++++++
  meta/recipes-core/uclibc/uclibc_git.bb             |    2 -
  meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    8 +-
  6 files changed, 91 insertions(+), 73 deletions(-)
Quoted 3 lines

delete mode 100644 meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch

Merged into OE-Core

Thanks
Sau!