summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-17 13:53:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:09:01 +0100
commitcd9ab376a2a5f39642b70d6ff6a31dd5c2d84535 (patch)
treee6b8c87dc5a0f7f8073c38c0ddf6e0565185986e /meta
parent8673b60f2646ab7851122147417d4c1024c182d8 (diff)
downloadpoky-cd9ab376a2a5f39642b70d6ff6a31dd5c2d84535.tar.gz
eglibc: rewritten tzselect as posix sh and move it to tzcode package
The problem is that this would cause bash installed to meta-toolchain, the dependencies chain is: meta-toolchain -> eglibc-utils -> bash We should eliminate bash dependencies in anything core to a tiny system. The eglibc-utils also provides eglibc-utils/usr/bin/zdump, eglibc-utils/usr/bin/zic which all of them belonged to tzcode, so we should split these three utils as tzcode package. [YOCTO #6544] (From OE-Core rev: f7f3a1fb3855799bb48708f32533e93e336e6995) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.19/timezone-re-written-tzselect-as-posix-sh.patch40
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc6
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.19.bb1
3 files changed, 45 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/eglibc/eglibc-2.19/timezone-re-written-tzselect-as-posix-sh.patch
new file mode 100644
index 0000000000..1477ea2cc5
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.19/timezone-re-written-tzselect-as-posix-sh.patch
@@ -0,0 +1,40 @@
1timezone: re-written tzselect as posix sh
2
3To avoid the bash dependency.
4
5Upstream-Status: Pending
6
7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8---
9 timezone/Makefile | 2 +-
10 timezone/tzselect.ksh | 2 +-
11 2 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/timezone/Makefile b/timezone/Makefile
14--- a/timezone/Makefile
15+++ b/timezone/Makefile
16@@ -113,7 +113,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
17
18
19 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
20- sed -e 's|/bin/bash|$(KSH)|g' \
21+ sed -e 's|/bin/bash|/bin/sh|g' \
22 -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
23 -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
24 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
25diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
26index 9d70691..25f45a8 100644
27--- a/timezone/tzselect.ksh
28+++ b/timezone/tzselect.ksh
29@@ -35,7 +35,7 @@ REPORT_BUGS_TO=tz@iana.org
30
31 # Specify default values for environment variables if they are unset.
32 : ${AWK=awk}
33-: ${TZDIR=`pwd`}
34+: ${TZDIR=$(pwd)}
35
36 # Check for awk Posix compliance.
37 ($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1
38--
391.8.1.2
40
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index d5d407f5e7..c357a1376b 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -17,7 +17,7 @@ python __anonymous () {
17# Set this to zero if you don't want ldconfig in the output package 17# Set this to zero if you don't want ldconfig in the output package
18USE_LDCONFIG ?= "1" 18USE_LDCONFIG ?= "1"
19 19
20PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} eglibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" 20PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} eglibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
21 21
22# The ld.so in this eglibc supports the GNU_HASH 22# The ld.so in this eglibc supports the GNU_HASH
23RPROVIDES_${PN} = "glibc rtld(GNU_HASH)" 23RPROVIDES_${PN} = "glibc rtld(GNU_HASH)"
@@ -47,6 +47,7 @@ FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_no
47FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" 47FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
48FILES_nscd = "${sbindir}/nscd*" 48FILES_nscd = "${sbindir}/nscd*"
49FILES_${PN}-mtrace = "${bindir}/mtrace" 49FILES_${PN}-mtrace = "${bindir}/mtrace"
50FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
50FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" 51FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
51FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" 52FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
52FILES_catchsegv = "${bindir}/catchsegv" 53FILES_catchsegv = "${bindir}/catchsegv"
@@ -65,8 +66,9 @@ DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services.
65SUMMARY_ldd = "print shared library dependencies" 66SUMMARY_ldd = "print shared library dependencies"
66DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." 67DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line."
67SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" 68SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc"
68DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." 69DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, rpcinfo, ..."
69DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" 70DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
71DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
70 72
71inherit libc-common multilib_header 73inherit libc-common multilib_header
72 74
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 2d354cbec5..19bd52d5d7 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -27,6 +27,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
27 file://ppce6500-32b_slow_ieee754_sqrt.patch \ 27 file://ppce6500-32b_slow_ieee754_sqrt.patch \
28 file://grok_gold.patch \ 28 file://grok_gold.patch \
29 file://fix_am_rootsbindir.patch;striplevel=2 \ 29 file://fix_am_rootsbindir.patch;striplevel=2 \
30 file://timezone-re-written-tzselect-as-posix-sh.patch \
30 " 31 "
31SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" 32SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
32SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" 33SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"