diff options
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-common.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-testing.inc | 47 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 11 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.14.bb | 10 |
5 files changed, 60 insertions, 10 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-common.inc b/meta/recipes-core/eglibc/eglibc-common.inc index 4fa64885fb..d18786ab93 100644 --- a/meta/recipes-core/eglibc/eglibc-common.inc +++ b/meta/recipes-core/eglibc/eglibc-common.inc | |||
@@ -3,7 +3,6 @@ DESCRIPTION = "Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) | |||
3 | HOMEPAGE = "http://www.eglibc.org/home" | 3 | HOMEPAGE = "http://www.eglibc.org/home" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "GPLv2 & LGPLv2.1" | 5 | LICENSE = "GPLv2 & LGPLv2.1" |
6 | INC_PR = "r11" | ||
7 | LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \ | 6 | LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \ |
8 | file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ | 7 | file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ |
9 | file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ | 8 | file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ |
diff --git a/meta/recipes-core/eglibc/eglibc-testing.inc b/meta/recipes-core/eglibc/eglibc-testing.inc new file mode 100644 index 0000000000..fb632ba26d --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-testing.inc | |||
@@ -0,0 +1,47 @@ | |||
1 | do_compile_append () { | ||
2 | # now generate script to drive testing | ||
3 | echo "#!/usr/bin/env sh" >${B}/${HOST_PREFIX}testeglibc | ||
4 | set >> ${B}/${HOST_PREFIX}testeglibc | ||
5 | # prune out the unneeded vars | ||
6 | sed -i -e "/^BASH/d" ${B}/${HOST_PREFIX}testeglibc | ||
7 | sed -i -e "/^USER/d" ${B}/${HOST_PREFIX}testeglibc | ||
8 | sed -i -e "/^OPT/d" ${B}/${HOST_PREFIX}testeglibc | ||
9 | sed -i -e "/^DIRSTACK/d" ${B}/${HOST_PREFIX}testeglibc | ||
10 | sed -i -e "/^EUID/d" ${B}/${HOST_PREFIX}testeglibc | ||
11 | sed -i -e "/^FUNCNAME/d" ${B}/${HOST_PREFIX}testeglibc | ||
12 | sed -i -e "/^GROUPS/d" ${B}/${HOST_PREFIX}testeglibc | ||
13 | sed -i -e "/^HOST/d" ${B}/${HOST_PREFIX}testeglibc | ||
14 | sed -i -e "/^HOME/d" ${B}/${HOST_PREFIX}testeglibc | ||
15 | sed -i -e "/^IFS/d" ${B}/${HOST_PREFIX}testeglibc | ||
16 | sed -i -e "/^LC_ALL/d" ${B}/${HOST_PREFIX}testeglibc | ||
17 | sed -i -e "/^LOGNAME/d" ${B}/${HOST_PREFIX}testeglibc | ||
18 | sed -i -e "/^MACHTYPE/d" ${B}/${HOST_PREFIX}testeglibc | ||
19 | sed -i -e "/^OSTYPE/d" ${B}/${HOST_PREFIX}testeglibc | ||
20 | sed -i -e "/^PIPE/d" ${B}/${HOST_PREFIX}testeglibc | ||
21 | sed -i -e "/^SHELL/d" ${B}/${HOST_PREFIX}testeglibc | ||
22 | sed -i -e "/^'/d" ${B}/${HOST_PREFIX}testeglibc | ||
23 | sed -i -e "/^UID/d" ${B}/${HOST_PREFIX}testeglibc | ||
24 | sed -i -e "/^TERM/d" ${B}/${HOST_PREFIX}testeglibc | ||
25 | sed -i -e "/^PATCH_GET/d" ${B}/${HOST_PREFIX}testeglibc | ||
26 | sed -i -e "/^PKG_/d" ${B}/${HOST_PREFIX}testeglibc | ||
27 | sed -i -e "/^POSIXLY_/d" ${B}/${HOST_PREFIX}testeglibc | ||
28 | sed -i -e "/^PPID/d" ${B}/${HOST_PREFIX}testeglibc | ||
29 | sed -i -e "/^PS4/d" ${B}/${HOST_PREFIX}testeglibc | ||
30 | sed -i -e "/^Q/d" ${B}/${HOST_PREFIX}testeglibc | ||
31 | sed -i -e "/^SHLVL/d" ${B}/${HOST_PREFIX}testeglibc | ||
32 | sed -i -e "/^STAGING/d" ${B}/${HOST_PREFIX}testeglibc | ||
33 | sed -i -e "/^LD_LIBRARY_PATH/d" ${B}/${HOST_PREFIX}testeglibc | ||
34 | sed -i -e "/^PSEUDO/d" ${B}/${HOST_PREFIX}testeglibc | ||
35 | # append execution part script | ||
36 | cat >> ${B}/${HOST_PREFIX}testeglibc << STOP | ||
37 | target="\$1" | ||
38 | if [ "x\$target" = "x" ] | ||
39 | then | ||
40 | echo "Please specify the target machine and remote user in for of user@target" | ||
41 | exit 1; | ||
42 | fi | ||
43 | wrapper="${S}/scripts/cross-test-ssh.sh \$target" | ||
44 | localedef="${STAGING_BINDIR_NATIVE}/cross-localedef --little-endian --uint32-align=4" | ||
45 | make cross-localedef="\$localedef" cross-test-wrapper="\$wrapper" -k check | ||
46 | STOP | ||
47 | } | ||
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 272fcb6273..64694a04d8 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc | |||
@@ -1,5 +1,6 @@ | |||
1 | require eglibc-common.inc | 1 | require eglibc-common.inc |
2 | require eglibc-ld.inc | 2 | require eglibc-ld.inc |
3 | require eglibc-testing.inc | ||
3 | 4 | ||
4 | STAGINGCC = "gcc-cross-intermediate" | 5 | STAGINGCC = "gcc-cross-intermediate" |
5 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" | 6 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" |
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 955c4ec4b9..9d3ec85af6 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
@@ -3,7 +3,7 @@ require eglibc.inc | |||
3 | SRCREV = "15508" | 3 | SRCREV = "15508" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r18" | 6 | PR = "r19" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_13" | 9 | EGLIBC_BRANCH="eglibc-2_13" |
@@ -207,10 +207,11 @@ do_compile () { | |||
207 | done | 207 | done |
208 | ) | 208 | ) |
209 | echo "Adjust ldd script" | 209 | echo "Adjust ldd script" |
210 | [ -z "${RTLDLIST}" ] && return | 210 | if [ -n "${RTLDLIST}" ] |
211 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#' | 211 | then |
212 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#' | 212 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#' |
213 | 213 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#' | |
214 | fi | ||
214 | } | 215 | } |
215 | 216 | ||
216 | require eglibc-package.inc | 217 | require eglibc-package.inc |
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb index fd384f4705..8553106766 100644 --- a/meta/recipes-core/eglibc/eglibc_2.14.bb +++ b/meta/recipes-core/eglibc/eglibc_2.14.bb | |||
@@ -3,7 +3,7 @@ require eglibc.inc | |||
3 | SRCREV = "15870" | 3 | SRCREV = "15870" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_14" | 9 | EGLIBC_BRANCH="eglibc-2_14" |
@@ -209,9 +209,11 @@ do_compile () { | |||
209 | done | 209 | done |
210 | ) | 210 | ) |
211 | echo "Adjust ldd script" | 211 | echo "Adjust ldd script" |
212 | [ -z "${RTLDLIST}" ] && return | 212 | if [ -n "${RTLDLIST}" ] |
213 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#' | 213 | then |
214 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#' | 214 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#' |
215 | sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#' | ||
216 | fi | ||
215 | 217 | ||
216 | } | 218 | } |
217 | 219 | ||