summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-06-26 14:01:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-02 22:23:49 +0100
commit0188270f8cce65c4fb5937e0688c0ff70b0f2142 (patch)
treee7c29a1561070098485d9a628503a0634a20de96 /meta/recipes-core
parentc0d232875fe85d97700e7a7e44e52574a29784cd (diff)
downloadpoky-0188270f8cce65c4fb5937e0688c0ff70b0f2142.tar.gz
uclibc: Update to latest git/master version
Use kernel cfg management infra to manage kconfig fragments. Add fragments for locale and obstrack and enable them by default Drop aplready applied patches Drop DP = -1 (From OE-Core rev: 7bcf53ddb2e1a7171545f544ee2443b06d7c3359) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/uclibc/uclibc-config.inc12
-rw-r--r--meta/recipes-core/uclibc/uclibc-git.inc8
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch68
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch71
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch9
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/locale.cfg3
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/obstack.cfg1
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch10
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc6
9 files changed, 102 insertions, 86 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc
index 0c7a0ceb06..8b9e41c64d 100644
--- a/meta/recipes-core/uclibc/uclibc-config.inc
+++ b/meta/recipes-core/uclibc/uclibc-config.inc
@@ -1,3 +1,5 @@
1DEPENDS += "kern-tools-native"
2inherit cml1
1# 3#
2# Set the ARCH environment variable for uClibc compilation. 4# Set the ARCH environment variable for uClibc compilation.
3# Return value must match one of the architectures known to uClibc: 5# Return value must match one of the architectures known to uClibc:
@@ -128,3 +130,13 @@ def features_to_uclibc_conf(d):
128def features_to_uclibc_del(d): 130def features_to_uclibc_del(d):
129 cnf, rem = features_to_uclibc_settings(d) 131 cnf, rem = features_to_uclibc_settings(d)
130 return rem 132 return rem
133
134# returns all the elements from the src uri that are .cfg files
135def find_cfgs(d):
136 sources=src_patches(d, True)
137 sources_list=[]
138 for s in sources:
139 if s.endswith('.cfg'):
140 sources_list.append(s)
141
142 return sources_list
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index db00ee6243..dab243fc8e 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -1,6 +1,4 @@
1SRCREV="946799cd0ce0c6c803c9cb173a84f4d607bde350" 1SRCREV="c2c684f88157f8bd0c236c7546f922fbf66b64a1"
2
3DEFAULT_PREFERENCE = "-1"
4 2
5PV = "0.9.33+git${SRCPV}" 3PV = "0.9.33+git${SRCPV}"
6PR = "${INC_PR}.4" 4PR = "${INC_PR}.4"
@@ -10,6 +8,8 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
10SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ 8SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
11 file://uClibc.machine \ 9 file://uClibc.machine \
12 file://uClibc.distro \ 10 file://uClibc.distro \
11 file://obstack.cfg \
12 file://locale.cfg \
13 file://uclibc_enable_log2_test.patch \ 13 file://uclibc_enable_log2_test.patch \
14 file://powerpc_copysignl.patch \ 14 file://powerpc_copysignl.patch \
15 file://argp-support.patch \ 15 file://argp-support.patch \
@@ -22,6 +22,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
22 file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \ 22 file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
23 file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \ 23 file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
24 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ 24 file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
25 file://0001-i386-sysdep.h-Remove-STABS_-macros.patch \ 25 file://0001-add-posix_fadvise-for-arm.patch \
26 " 26 "
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch b/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch
new file mode 100644
index 0000000000..7c17a19420
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch
@@ -0,0 +1,68 @@
1From 236a65abe0a6810e20498fc0ba8d02d90978953b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 29 Jun 2013 22:46:53 -0700
4Subject: [PATCH] add posix_fadvise() for arm
5
6arm call to posix_fadvise simply calls posix_fadvise64
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 libc/sysdeps/linux/common/posix_fadvise.c | 24 ++++++++++++++++--------
11 1 file changed, 16 insertions(+), 8 deletions(-)
12
13Upstream-Status: Pending
14
15diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c
16index d3e1bd4..e102ce7 100644
17--- a/libc/sysdeps/linux/common/posix_fadvise.c
18+++ b/libc/sysdeps/linux/common/posix_fadvise.c
19@@ -10,30 +10,38 @@
20
21 #include <sys/syscall.h>
22
23-#ifdef __NR_fadvise64
24+#if defined(__NR_fadvise64) || defined(__NR_arm_fadvise64_64)
25 # include <fcntl.h>
26 # include <endian.h>
27 # include <bits/wordsize.h>
28
29+# ifdef __NR_arm_fadvise64_64
30+int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice);
31+# endif
32+
33 int posix_fadvise(int fd, off_t offset, off_t len, int advice)
34 {
35+# ifdef __NR_arm_fadvise64_64
36+ return posix_fadvise64(fd, offset, len, advice);
37+# else
38 int ret;
39 INTERNAL_SYSCALL_DECL(err);
40-# if __WORDSIZE == 64
41+# if __WORDSIZE == 64
42 ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice);
43-# else
44-# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__)
45- ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
46 # else
47+# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__)
48+ ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0,
49+# else
50 ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd,
51-# endif
52+# endif
53 OFF_HI_LO (offset), len, advice);
54-# endif
55+# endif
56 if (INTERNAL_SYSCALL_ERROR_P (ret, err))
57 return INTERNAL_SYSCALL_ERRNO (ret, err);
58 return 0;
59+# endif
60 }
61-# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64)
62+# if defined __UCLIBC_HAS_LFS__ && ((!defined __NR_fadvise64_64 && !defined __NR_arm_fadvise64_64) || __WORDSIZE == 64)
63 strong_alias(posix_fadvise,posix_fadvise64)
64 # endif
65 #endif
66--
671.7.9.5
68
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch b/meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch
deleted file mode 100644
index 8512c456a5..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1Upstream-Status: Submitted
2
3-Khem
4
5From e20fd2c2427be981c16cb936cc6866d08520de9b Mon Sep 17 00:00:00 2001
6From: Khem Raj <raj.khem@gmail.com>
7Date: Mon, 25 Mar 2013 19:34:39 -0700
8Subject: [PATCH] i386/sysdep.h: Remove STABS_* macros
9
10uclibc is compiled with elf/dwarf and secondly HAVE_CPP_ASM_DEBUGINFO
11is not defined so we generate bogus .stab sections needlessly
12
13Some of post processing tools get confused when they see both
14dwarf and stab sections
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 libc/sysdeps/linux/i386/sysdep.h | 27 ---------------------------
19 1 file changed, 27 deletions(-)
20
21diff --git a/libc/sysdeps/linux/i386/sysdep.h b/libc/sysdeps/linux/i386/sysdep.h
22index 983c4f5..7a8d2e2 100644
23--- a/libc/sysdeps/linux/i386/sysdep.h
24+++ b/libc/sysdeps/linux/i386/sysdep.h
25@@ -43,12 +43,9 @@
26 incomplete stabs information. Fake some entries here which specify
27 the current source file. */
28 #define ENTRY(name) \
29- STABS_CURRENT_FILE1("") \
30- STABS_CURRENT_FILE(name) \
31 ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
32 ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \
33 .align ALIGNARG(4); \
34- STABS_FUN(name) \
35 C_LABEL(name) \
36 cfi_startproc; \
37 CALL_MCOUNT
38@@ -57,30 +54,6 @@
39 #define END(name) \
40 cfi_endproc; \
41 ASM_SIZE_DIRECTIVE(name) \
42- STABS_FUN_END(name)
43-
44-#ifdef HAVE_CPP_ASM_DEBUGINFO
45-/* Disable that goop, because we just pass -g through to the assembler
46- and it generates proper line number information directly. */
47-# define STABS_CURRENT_FILE1(name)
48-# define STABS_CURRENT_FILE(name)
49-# define STABS_FUN(name)
50-# define STABS_FUN_END(name)
51-#else
52-/* Remove the following two lines once the gdb bug is fixed. */
53-#define STABS_CURRENT_FILE(name) \
54- STABS_CURRENT_FILE1 (#name)
55-#define STABS_CURRENT_FILE1(name) \
56- 1: .stabs name,100,0,0,1b;
57-/* Emit stabs definition lines. We use F(0,1) and define t(0,1) as `int',
58- the same way gcc does it. */
59-#define STABS_FUN(name) STABS_FUN2(name, name##:F(0,1))
60-#define STABS_FUN2(name, namestr) \
61- .stabs "int:t(0,1)=r(0,1);-2147483648;2147483647;",128,0,0,0; \
62- .stabs #namestr,36,0,0,name;
63-#define STABS_FUN_END(name) \
64- 1: .stabs "",36,0,0,1b-name;
65-#endif
66
67 /* If compiled for profiling, call `mcount' at the start of each function. */
68 #ifdef PROF
69--
701.7.9.5
71
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
index 7fc5bd3d74..7e7c5793f1 100644
--- a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
@@ -13,9 +13,9 @@ Upstream-Status: Pending
13 13
14Index: git/libc/sysdeps/linux/arm/Makefile.arch 14Index: git/libc/sysdeps/linux/arm/Makefile.arch
15=================================================================== 15===================================================================
16--- git.orig/libc/sysdeps/linux/arm/Makefile.arch 2013-03-25 19:48:48.000000000 -0700 16--- git.orig/libc/sysdeps/linux/arm/Makefile.arch 2013-05-23 11:13:32.000000000 -0700
17+++ git/libc/sysdeps/linux/arm/Makefile.arch 2013-03-25 19:51:57.496677771 -0700 17+++ git/libc/sysdeps/linux/arm/Makefile.arch 2013-05-23 11:16:18.304333131 -0700
18@@ -13,7 +13,10 @@ 18@@ -13,7 +13,9 @@
19 vfork.S clone.S 19 vfork.S clone.S
20 20
21 SSRC-$(UCLIBC_HAS_LFS) += mmap64.S 21 SSRC-$(UCLIBC_HAS_LFS) += mmap64.S
@@ -23,7 +23,6 @@ Index: git/libc/sysdeps/linux/arm/Makefile.arch
23+SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S 23+SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S
24+libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os 24+libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os
25+libc-static-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.o 25+libc-static-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.o
26+
27 CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c
28 CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c 26 CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c
29 SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S 27 SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S
28
diff --git a/meta/recipes-core/uclibc/uclibc-git/locale.cfg b/meta/recipes-core/uclibc/uclibc-git/locale.cfg
new file mode 100644
index 0000000000..fc66435163
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/locale.cfg
@@ -0,0 +1,3 @@
1UCLIBC_HAS_LOCALE=y
2UCLIBC_HAS_XLOCALE=y
3UCLIBC_BUILD_MINIMAL_LOCALE=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/obstack.cfg b/meta/recipes-core/uclibc/uclibc-git/obstack.cfg
new file mode 100644
index 0000000000..36bf9d6e4a
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/obstack.cfg
@@ -0,0 +1 @@
UCLIBC_HAS_OBSTACK=y
diff --git a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
index ce58583c81..2f014cd91e 100644
--- a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
+++ b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
@@ -6,21 +6,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 6
7Index: git/libc/sysdeps/linux/powerpc/Makefile.arch 7Index: git/libc/sysdeps/linux/powerpc/Makefile.arch
8=================================================================== 8===================================================================
9--- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch 2013-01-21 16:18:22.000000000 -0800 9--- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch 2013-05-23 11:09:50.000000000 -0700
10+++ git/libc/sysdeps/linux/powerpc/Makefile.arch 2013-01-21 16:21:25.363552429 -0800 10+++ git/libc/sysdeps/linux/powerpc/Makefile.arch 2013-05-23 11:12:06.072328399 -0700
11@@ -5,7 +5,7 @@ 11@@ -5,7 +5,7 @@
12 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. 12 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
13 # 13 #
14 14
15-CSRC-y := __syscall_error.c pread_write.c ioctl.c 15-CSRC-y := __syscall_error.c ioctl.c
16+CSRC-y := __syscall_error.c pread_write.c ioctl.c copysignl.c 16+CSRC-y := __syscall_error.c ioctl.c copysignl.c
17 17
18 SSRC-y := \ 18 SSRC-y := \
19 __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ 19 __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \
20Index: git/libc/sysdeps/linux/powerpc/copysignl.c 20Index: git/libc/sysdeps/linux/powerpc/copysignl.c
21=================================================================== 21===================================================================
22--- /dev/null 1970-01-01 00:00:00.000000000 +0000 22--- /dev/null 1970-01-01 00:00:00.000000000 +0000
23+++ git/libc/sysdeps/linux/powerpc/copysignl.c 2013-01-21 16:20:46.807552554 -0800 23+++ git/libc/sysdeps/linux/powerpc/copysignl.c 2013-05-23 11:11:37.600327865 -0700
24@@ -0,0 +1,89 @@ 24@@ -0,0 +1,89 @@
25+/* s_copysignl.c -- long double version of s_copysign.c. 25+/* s_copysignl.c -- long double version of s_copysign.c.
26+ * Conversion to long double by Ulrich Drepper, 26+ * Conversion to long double by Ulrich Drepper,
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index c25c4d151a..86a7417f34 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -60,8 +60,10 @@ export V="2"
60CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" 60CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}"
61UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" 61UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}"
62UCLIBC_EXTRA_LDFLAGS := "${@oe_filter_out('(-L\S+|-l\S+)', '${LDFLAGS}', d)}" 62UCLIBC_EXTRA_LDFLAGS := "${@oe_filter_out('(-L\S+|-l\S+)', '${LDFLAGS}', d)}"
63
63do_compile_prepend () { 64do_compile_prepend () {
64 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 65 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
66 oe_runmake pregen
65} 67}
66 68
67configmangle = '/^KERNEL_HEADERS/d; \ 69configmangle = '/^KERNEL_HEADERS/d; \
@@ -146,8 +148,10 @@ do_configure() {
146 148
147 # Mangle the resulting .config depending on OE variables 149 # Mangle the resulting .config depending on OE variables
148 sed -i -e '${configmangle}' ${S}/merged.config 150 sed -i -e '${configmangle}' ${S}/merged.config
151 cp ${S}/merged.config .config
152 merge_config.sh -r -n -m .config ${@" ".join(find_cfgs(d))}
153 cml1_do_configure
149 154
150 oe_runmake KCONFIG_ALLCONFIG=${S}/merged.config allnoconfig
151} 155}
152 156
153do_install() { 157do_install() {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 00:23:13 +0000