diff options
author | Richard Purdie <richard@openedhand.com> | 2006-09-22 13:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-09-22 13:13:04 +0000 |
commit | 7aceb0063b06e65e4780b1b7f95ea12c105698ee (patch) | |
tree | 5aae90036011ee091e4325a03598249829d65be8 /meta | |
parent | 8d804ea40a349e679850b716012120e54fe5242d (diff) | |
download | poky-7aceb0063b06e65e4780b1b7f95ea12c105698ee.tar.gz |
glibc-package.bbclass: Merge task order fixes from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@744 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/glibc/glibc-package.bbclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass index 6b191434ed..51f5a80bec 100644 --- a/meta/packages/glibc/glibc-package.bbclass +++ b/meta/packages/glibc/glibc-package.bbclass | |||
@@ -8,12 +8,13 @@ | |||
8 | 8 | ||
9 | python __anonymous () { | 9 | python __anonymous () { |
10 | import bb, re | 10 | import bb, re |
11 | uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) | 11 | uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) |
12 | if uc_os: | 12 | if uc_os: |
13 | raise bb.parse.SkipPackage("incompatible with target %s" % | 13 | raise bb.parse.SkipPackage("incompatible with target %s" % |
14 | bb.data.getVar('TARGET_OS', d, 1)) | 14 | bb.data.getVar('TARGET_OS', d, 1)) |
15 | } | 15 | } |
16 | 16 | ||
17 | |||
17 | # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION | 18 | # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION |
18 | # is set. The idea is to avoid running localedef on the target (at first boot) | 19 | # is set. The idea is to avoid running localedef on the target (at first boot) |
19 | # to decrease initial boot time and avoid localedef being killed by the OOM | 20 | # to decrease initial boot time and avoid localedef being killed by the OOM |
@@ -78,6 +79,13 @@ do_install() { | |||
78 | grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp | 79 | grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp |
79 | mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED | 80 | mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED |
80 | done | 81 | done |
82 | # If indicated, only build a limited selection of locales | ||
83 | if [ "${LIMIT_BUILT_LOCALES}" != "${LIMIT_BUILT_LOCALES}" ]; then | ||
84 | for i in ${LIMIT_BUILT_LOCALES}; do | ||
85 | grep $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp | ||
86 | mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED | ||
87 | done | ||
88 | fi | ||
81 | rm -f ${D}/etc/rpc | 89 | rm -f ${D}/etc/rpc |
82 | } | 90 | } |
83 | 91 | ||
@@ -143,7 +151,7 @@ do_prep_locale_tree() { | |||
143 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do | 151 | for i in $treedir/${datadir}/i18n/charmaps/*gz; do |
144 | gunzip $i | 152 | gunzip $i |
145 | done | 153 | done |
146 | cp -a ${STAGING_LIBDIR}/* $treedir/lib | 154 | cp -a ${D}/lib/* $treedir/lib |
147 | if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then | 155 | if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then |
148 | cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib | 156 | cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib |
149 | fi | 157 | fi |
@@ -194,10 +202,6 @@ python package_do_split_gconvs () { | |||
194 | if m: | 202 | if m: |
195 | dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) | 203 | dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) |
196 | if not dp in deps: | 204 | if not dp in deps: |
197 | if '<' in dp: | ||
198 | bb.note('warning, dp is %s' % dp) | ||
199 | bb.note(' fn is %s' % fn) | ||
200 | bb.note(' line was %s' % l) | ||
201 | deps.append(dp) | 205 | deps.append(dp) |
202 | f.close() | 206 | f.close() |
203 | if deps != []: | 207 | if deps != []: |