* [PATCH 0/3] uclibc and eglibc update
@ 2012-08-30 5:27 Khem Raj
2012-08-30 5:27 ` [PATCH 1/3] uclibc-git: Move to tip of master and sync mount.h Khem Raj
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Khem Raj @ 2012-08-30 5:27 UTC (permalink / raw)
To: openembedded-core
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
--
1.7.9.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] uclibc-git: Move to tip of master and sync mount.h
2012-08-30 5:27 [PATCH 0/3] uclibc and eglibc update Khem Raj
@ 2012-08-30 5:27 ` Khem Raj
2012-08-30 5:27 ` [PATCH 2/3] eglibc: Bring in the fix for glibc bug #14459, #14195 Khem Raj
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2012-08-30 5:27 UTC (permalink / raw)
To: openembedded-core
mount.h sync with glibc is needed to get new defines
which are needed for some packages like systemd
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index 60d36f4..eec4ded 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -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"
diff --git a/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch
new file mode 100644
index 0000000..41a410c
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch
@@ -0,0 +1,83 @@
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+sync mount.h with glibc
+
+Index: git/include/sys/mount.h
+===================================================================
+--- git.orig/include/sys/mount.h 2012-08-23 21:26:51.038825295 -0700
++++ git/include/sys/mount.h 2012-08-23 21:27:09.914826014 -0700
+@@ -1,5 +1,5 @@
+ /* Header file for mounting/unmount Linux filesystems.
+- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
++ Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -47,23 +47,46 @@
+ #define MS_REMOUNT MS_REMOUNT
+ MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
+ #define MS_MANDLOCK MS_MANDLOCK
+- S_WRITE = 128, /* Write on file/directory/symlink. */
+-#define S_WRITE S_WRITE
+- S_APPEND = 256, /* Append-only file. */
+-#define S_APPEND S_APPEND
+- S_IMMUTABLE = 512, /* Immutable file. */
+-#define S_IMMUTABLE S_IMMUTABLE
++ MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
++#define MS_DIRSYNC MS_DIRSYNC
+ MS_NOATIME = 1024, /* Do not update access times. */
+ #define MS_NOATIME MS_NOATIME
+ MS_NODIRATIME = 2048, /* Do not update directory access times. */
+ #define MS_NODIRATIME MS_NODIRATIME
+ MS_BIND = 4096, /* Bind directory at different place. */
+ #define MS_BIND MS_BIND
++ MS_MOVE = 8192,
++#define MS_MOVE MS_MOVE
++ MS_REC = 16384,
++#define MS_REC MS_REC
++ MS_SILENT = 32768,
++#define MS_SILENT MS_SILENT
++ MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
++#define MS_POSIXACL MS_POSIXACL
++ MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
++#define MS_UNBINDABLE MS_UNBINDABLE
++ MS_PRIVATE = 1 << 18, /* Change to private. */
++#define MS_PRIVATE MS_PRIVATE
++ MS_SLAVE = 1 << 19, /* Change to slave. */
++#define MS_SLAVE MS_SLAVE
++ MS_SHARED = 1 << 20, /* Change to shared. */
++#define MS_SHARED MS_SHARED
++ MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
++#define MS_RELATIME MS_RELATIME
++ MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
++#define MS_KERNMOUNT MS_KERNMOUNT
++ MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
++#define MS_I_VERSION MS_I_VERSION
++ MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
++#define MS_STRICTATIME MS_STRICTATIME
++ MS_ACTIVE = 1 << 30,
++#define MS_ACTIVE MS_ACTIVE
++ MS_NOUSER = 1 << 31
++#define MS_NOUSER MS_NOUSER
+ };
+
+ /* Flags that can be altered by MS_REMOUNT */
+-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
+- |MS_NODIRATIME)
++#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
+
+
+ /* Magic mount flag number. Has to be or-ed to the flag values. */
+@@ -100,8 +123,10 @@
+ #define MNT_FORCE MNT_FORCE
+ MNT_DETACH = 2, /* Just detach from the tree. */
+ #define MNT_DETACH MNT_DETACH
+- MNT_EXPIRE = 4 /* Mark for expiry. */
++ MNT_EXPIRE = 4, /* Mark for expiry. */
+ #define MNT_EXPIRE MNT_EXPIRE
++ UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */
++#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
+ };
+
+
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index 2a60947..e8a6d68 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -1,5 +1,3 @@
-SRCREV="0dcc13bf7a61b1d0708e5dd103d5515e0ffec79a"
-
require uclibc.inc
require uclibc-package.inc
require uclibc-git.inc
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] eglibc: Bring in the fix for glibc bug #14459, #14195
2012-08-30 5:27 [PATCH 0/3] uclibc and eglibc update Khem Raj
2012-08-30 5:27 ` [PATCH 1/3] uclibc-git: Move to tip of master and sync mount.h Khem Raj
@ 2012-08-30 5:27 ` Khem Raj
2012-08-30 5:27 ` [PATCH 3/3] elfutils: Fix build on uclibc Khem Raj
2012-09-04 14:43 ` [PATCH 0/3] uclibc and eglibc update Saul Wold
3 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2012-08-30 5:27 UTC (permalink / raw)
To: openembedded-core
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../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
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch b/meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch
deleted file mode 100644
index 130a816..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.16/rpc-bootstrap.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-
-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: <1341345251-31730-1-git-send-email-vapier@gentoo.org>
-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 <vapier@gentoo.org>
-
-2012-07-03 Mike Frysinger <vapier@gentoo.org>
-
- * 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"
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 69803f7..3b11892 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -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 \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] elfutils: Fix build on uclibc
2012-08-30 5:27 [PATCH 0/3] uclibc and eglibc update Khem Raj
2012-08-30 5:27 ` [PATCH 1/3] uclibc-git: Move to tip of master and sync mount.h Khem Raj
2012-08-30 5:27 ` [PATCH 2/3] eglibc: Bring in the fix for glibc bug #14459, #14195 Khem Raj
@ 2012-08-30 5:27 ` Khem Raj
2012-09-04 14:43 ` [PATCH 0/3] uclibc and eglibc update Saul Wold
3 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2012-08-30 5:27 UTC (permalink / raw)
To: openembedded-core
It depends on libintl so add virtual/libintl to DEPENDS
simplify the overridden statements
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/elfutils/elfutils_0.148.bb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 90bc308..5d45f3a 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] uclibc and eglibc update
2012-08-30 5:27 [PATCH 0/3] uclibc and eglibc update Khem Raj
` (2 preceding siblings ...)
2012-08-30 5:27 ` [PATCH 3/3] elfutils: Fix build on uclibc Khem Raj
@ 2012-09-04 14:43 ` Saul Wold
3 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-09-04 14:43 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On 08/29/2012 10:27 PM, Khem Raj wrote:
>
> 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
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-04 14:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-30 5:27 [PATCH 0/3] uclibc and eglibc update Khem Raj
2012-08-30 5:27 ` [PATCH 1/3] uclibc-git: Move to tip of master and sync mount.h Khem Raj
2012-08-30 5:27 ` [PATCH 2/3] eglibc: Bring in the fix for glibc bug #14459, #14195 Khem Raj
2012-08-30 5:27 ` [PATCH 3/3] elfutils: Fix build on uclibc Khem Raj
2012-09-04 14:43 ` [PATCH 0/3] uclibc and eglibc update Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox