Skip to contentSkip to conversation

Upgrade uclibc

PATCH New Khem Raj 1 participant 5 messages Aug 25, 2014

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

v2 cover Upgrade uclibc

V2 Adds

More systemd build fixes to support uclibc
uclibc fixes needed for systemd to build

The following changes since commit 217aa4d9802609d2c3628c8751a27a5d25900898:

autogen-native: inherit pkgconfig to fix a build failure (2014-08-25 10:25:54 +0100)

are available in the git repository at:

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

Khem Raj (4):
openssl: Re-add linux-uclibc tuple
uclibc: Upgrade to tip of master
uclibc: Support systemd builds
systemd: Support building on uclibc

 meta/recipes-connectivity/openssl/openssl.inc      |    1 +
 ...-Including-missing.h-to-get-MAX_HANDLE_SZ.patch |   29 ++
 meta/recipes-core/systemd/systemd_213.bb           |    1 +
 meta/recipes-core/uclibc/uclibc-git.inc            |    6 +-
 ...IPTOS_CLASS_-macros-according-to-RFC-2474.patch |   75 ++++
 .../uclibc-git/0001-timex-Sync-with-glibc.patch    |   33 ++
 ...tl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch |  377 --------------------
 .../0004-Add-clock_adjtime-syscall.patch           |   75 ----
 .../uclibc-git/remove_attribute_optimize_Os.patch  |  125 +------
 meta/recipes-core/uclibc/uclibc.inc                |    6 +-
 10 files changed, 147 insertions(+), 581 deletions(-)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH v2 1/4 openssl: Re-add linux-uclibc tuple

With last restructuring for musl, some of uclibc targets got ignored fsl/ppc and ARM worked ok since they use special target triplets which were already considered but other like mips, x86 and so on failed

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-connectivity/openssl/openssl.inc |    1 +
 1 file changed, 1 insertion(+)
meta/recipes-connectivity/openssl/openssl.inc +1 -0
index b63d164..9ec884f 100644
@@ -62,6 +62,7 @@ do_configure () {
 
 	os=${HOST_OS}
 	case $os in
+	linux-uclibc |\
 	linux-uclibceabi |\
 	linux-gnueabi |\
 	linux-uclibcspe |\
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH v2 2/4 uclibc: Upgrade to tip of master

Adjust mips to cater for new mips32r2 defaulttune
Remove upstreamed patches

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/uclibc/uclibc-git.inc            |    4 +-
 ...tl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch |  377 --------------------
 .../0004-Add-clock_adjtime-syscall.patch           |   75 ----
 .../uclibc-git/remove_attribute_optimize_Os.patch  |  125 +------
 meta/recipes-core/uclibc/uclibc.inc                |    6 +-
 5 files changed, 6 insertions(+), 581 deletions(-)
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch
meta/recipes-core/uclibc/uclibc-git.inc +1 -3
index 69e834d..a6b9f65 100644
@@ -1,4 +1,4 @@
-SRCREV="5eddde8f094ef52dca06695cc598e3b2556dcccb"
+SRCREV = "48a0006012679ff0eda6f256da958d73a924fb57"
 
 PV = "0.9.33+git${SRCPV}"
 

@@ -23,7 +23,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
 	file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
 	file://0001-Add-eventfd_read-and-eventfd_write.patch \
 	file://0002-wire-setns-syscall.patch \
-	file://0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch \
-	file://0004-Add-clock_adjtime-syscall.patch \ 
 	"
 S = "${WORKDIR}/git"
meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch deleted +0 -377

377 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch deleted +0 -75

75 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch +2 -123

134 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc.inc +3 -3
index a86ac3d..18587ca 100644
@@ -93,10 +93,10 @@ python () {
     # if we use TARGET_CC_ARCH="-march=mips32" we end up 
     # with conflicting march options to gcc. Here we
     # ask for MIPS32 ISA to match the chosen arch
-
-    if "mips32" in d.getVar("TUNE_FEATURES",True):
+    tune = d.getVar("DEFAULTTUNE", True)
+    if tune in ['mips32', 'mips32r2']:
         d.setVar('configmangle_append',
-                 "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_MIPS32=y\n\n")
+                 "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_%s=y\n\n" % (tune.upper()))
     if "${OE_FEATURES}":
         d.setVar('configmangle_append',
                    "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH v2 3/4 uclibc: Support systemd builds

In reply to Khem Raj

Systemd needs some extra defines e.g.
ADJ_NANO and IPTOS_CLASS_CS6

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/uclibc/uclibc-git.inc            |    2 +
 ...IPTOS_CLASS_-macros-according-to-RFC-2474.patch |   75 ++++++++++++++++++++
 .../uclibc-git/0001-timex-Sync-with-glibc.patch    |   33 +++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch
meta/recipes-core/uclibc/uclibc-git.inc +2 -0
index a6b9f65..a2b2353 100644
@@ -23,5 +23,7 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
 	file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
 	file://0001-Add-eventfd_read-and-eventfd_write.patch \
 	file://0002-wire-setns-syscall.patch \
+	file://0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch \
+	file://0001-timex-Sync-with-glibc.patch \
 	"
 S = "${WORKDIR}/git"
meta/recipes-core/uclibc/uclibc-git/0001-Define-IPTOS_CLASS_-macros-according-to-RFC-2474.patch new file +75 -0

75 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc-git/0001-timex-Sync-with-glibc.patch new file +33 -0
new file mode 100644
index 0000000..5d6a0a5
@@ -0,0 +1,33 @@
+From f489cc44a209f6c4370e94c9c788fc9cc4820be1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 25 Aug 2014 16:22:57 -0700
+Subject: [PATCH] timex: Sync with glibc
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-status: Pending
+---
+ include/sys/timex.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/include/sys/timex.h b/include/sys/timex.h
+index 9082a28..57059bd 100644
+--- a/include/sys/timex.h
++++ b/include/sys/timex.h
+@@ -67,8 +67,12 @@ struct timex
+ #define ADJ_ESTERROR		0x0008	/* estimated time error */
+ #define ADJ_STATUS		0x0010	/* clock status */
+ #define ADJ_TIMECONST		0x0020	/* pll time constant */
+-#define ADJ_TICK		0x4000	/* tick value */
+-#define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
++#define ADJ_TAI			0x0080  /* set TAI offset */
++#define ADJ_MICRO		0x1000  /* select microsecond resolution */
++#define ADJ_NANO		0x2000  /* select nanosecond resolution */
++#define ADJ_TICK		0x4000  /* tick value */
++#define ADJ_OFFSET_SINGLESHOT	0x8001  /* old-fashioned adjtime */
++#define ADJ_OFFSET_SS_READ	0xa001  /* read-only adjtime */
+ 
+ /* xntp 3.4 compatibility names */
+ #define MOD_OFFSET	ADJ_OFFSET
+-- 
+2.1.0
+
Signature · 1 line
1.7.10.4
author
#4 lore raw

PATCH v2 4/4 systemd: Support building on uclibc

In reply to Khem Raj

include missing.h to get MAX_HANDLE_SZ which
is not defined in uclibc.

Signed-off-by Khem Raj <[email protected]>
---
 ...-Including-missing.h-to-get-MAX_HANDLE_SZ.patch |   29 ++++++++++++++++++++
 meta/recipes-core/systemd/systemd_213.bb           |    1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch
meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch new file +29 -0
new file mode 100644
index 0000000..ba4a21b
@@ -0,0 +1,29 @@
+From 764ecbeda4813f33eafd45fdc3ccb9376356f475 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 25 Aug 2014 15:40:31 -0700
+Subject: [PATCH] util: Including missing.h to get MAX_HANDLE_SZ
+
+Helps compiling on uclibc
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Upstream-Status: [Backport]
+---
+ src/shared/util.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/shared/util.h b/src/shared/util.h
+index 62eb604..036fc59 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -84,6 +84,7 @@
+ #endif
+ 
+ #include "macro.h"
++#include "missing.h"
+ #include "time-util.h"
+ 
+ /* What is interpreted as whitespace? */
+-- 
+1.7.10.4
+
meta/recipes-core/systemd/systemd_213.bb +1 -0
index ccdc10b..472a5d5 100644
@@ -31,6 +31,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
            file://0001-uClibc-doesn-t-implement-pwritev-preadv.patch \
            file://uclibc-sysinfo_h.patch \
            file://uclibc-get-physmem.patch \
+           file://0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch \
            file://touchscreen.rules \
            file://00-create-volatile.conf \
            file://init \
Signature · 1 line
1.7.10.4