diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 13:35:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 14:28:03 +0100 |
commit | 8bdb4de37cf543c96e5ed582038deb4be2987474 (patch) | |
tree | 00e1e734eb714e3f047b2291f4ebb5e724680183 /meta/recipes-core/eglibc | |
parent | 0401f4195875cf1aee390a23c832758a99871cb2 (diff) | |
download | poky-8bdb4de37cf543c96e5ed582038deb4be2987474.tar.gz |
glibc/eglibc: Clean up package warnings and potentially broken data in -dev package
These changes ensure files packaged in the -locale package aren't included
in the main do_install and also ensures the staging directory used for
the -locale package doesn't end up in the -dev package.
(From OE-Core rev: 2dccb370e04bc2bbe208b2b0541077d8ef519535)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 18 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 8228484815..831835612e 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -90,13 +90,21 @@ inherit libc-common | |||
90 | 90 | ||
91 | do_install_locale () { | 91 | do_install_locale () { |
92 | dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | 92 | dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} |
93 | install -d ${dest} ${dest}${bindir} | 93 | install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} |
94 | cp -fpPR ${D}${base_libdir} ${dest}${base_prefix} | 94 | cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} |
95 | cp -fpPR ${D}${libdir} ${dest}${exec_prefix} | 95 | cp -fpP ${D}${bindir}/localedef ${dest}${bindir} |
96 | cp -fpPR ${D}${datadir} ${dest}${exec_prefix} | 96 | mv ${D}${libdir}/gconv ${dest}${libdir} |
97 | cp -fpPR ${D}${bindir}/localedef ${dest}${bindir} | 97 | cp -fpPR ${D}${libdir}/* ${dest}${libdir} |
98 | mv ${D}${datadir}/i18n ${dest}${datadir} | ||
99 | cp -fpPR ${D}${datadir}/* ${dest}${datadir} | ||
98 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} | 100 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} |
99 | } | 101 | } |
100 | 102 | ||
101 | addtask do_install_locale after do_install before do_populate_sysroot | 103 | addtask do_install_locale after do_install before do_populate_sysroot |
102 | 104 | ||
105 | PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" | ||
106 | |||
107 | eglibc_package_preprocess () { | ||
108 | rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} | ||
109 | } | ||
110 | |||
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 47b1822ac6..60358e1791 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require eglibc.inc | 1 | require eglibc.inc |
2 | 2 | ||
3 | DEPENDS += "gperf-native" | 3 | DEPENDS += "gperf-native" |
4 | PR = "r16" | 4 | PR = "r17" |
5 | 5 | ||
6 | SRCREV = "14158" | 6 | SRCREV = "14158" |
7 | 7 | ||
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index dfedfef9d9..50880496f6 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
@@ -4,7 +4,7 @@ SRCREV = "14157" | |||
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | FILESPATHPKG =. "eglibc-svn:" | 6 | FILESPATHPKG =. "eglibc-svn:" |
7 | PR = "r3" | 7 | PR = "r4" |
8 | PR_append = "+svnr${SRCPV}" | 8 | PR_append = "+svnr${SRCPV}" |
9 | 9 | ||
10 | EGLIBC_BRANCH="eglibc-2_13" | 10 | EGLIBC_BRANCH="eglibc-2_13" |