summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc-package.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glibc/glibc-package.inc')
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc30
1 files changed, 18 insertions, 12 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index bad642449a..b8239e0f02 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -145,8 +145,11 @@ do_install_append_aarch64 () {
145 fi 145 fi
146} 146}
147 147
148do_install_locale () { 148LOCALESTASH = "${WORKDIR}/stashed-locale"
149 dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS} 149bashscripts = "mtrace sotruss xtrace"
150
151do_stash_locale () {
152 dest=${LOCALESTASH}
150 install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} 153 install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
151 if [ "${base_libdir}" != "${libdir}" ]; then 154 if [ "${base_libdir}" != "${libdir}" ]; then
152 cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} 155 cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
@@ -166,14 +169,8 @@ do_install_locale () {
166 cp -fpPR ${D}${datadir}/* ${dest}${datadir} 169 cp -fpPR ${D}${datadir}/* ${dest}${datadir}
167 rm -rf ${D}${datadir}/locale/ 170 rm -rf ${D}${datadir}/locale/
168 cp -fpPR ${WORKDIR}/SUPPORTED ${dest} 171 cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
169}
170
171addtask do_install_locale after do_install before do_populate_sysroot do_package
172 172
173bashscripts = "mtrace sotruss xtrace" 173 target=${dest}/scripts
174
175do_evacuate_scripts () {
176 target=${D}${includedir}/glibc-scripts-internal-${MULTIMACH_TARGET_SYS}
177 mkdir -p $target 174 mkdir -p $target
178 for i in ${bashscripts}; do 175 for i in ${bashscripts}; do
179 if [ -f ${D}${bindir}/$i ]; then 176 if [ -f ${D}${bindir}/$i ]; then
@@ -182,13 +179,22 @@ do_evacuate_scripts () {
182 done 179 done
183} 180}
184 181
185addtask evacuate_scripts after do_install before do_populate_sysroot do_package 182addtask do_stash_locale after do_install before do_populate_sysroot do_package
183do_stash_locale[dirs] = "${B}"
184do_stash_locale[cleandirs] = "${LOCALESTASH}"
185SSTATETASKS += "do_stash_locale"
186do_stash_locale[sstate-inputdirs] = "${LOCALESTASH}"
187do_stash_locale[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale"
188do_stash_locale[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale"
189
190python do_stash_locale_setscene () {
191 sstate_setscene(d)
192}
193addtask do_stash_locale_setscene
186 194
187PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess" 195PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess"
188 196
189glibc_package_preprocess () { 197glibc_package_preprocess () {
190 rm -rf ${PKGD}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}
191 rm -rf ${PKGD}/${includedir}/glibc-scripts-internal-${MULTIMACH_TARGET_SYS}
192 for i in ${bashscripts}; do 198 for i in ${bashscripts}; do
193 rm -f ${PKGD}${bindir}/$i 199 rm -f ${PKGD}${bindir}/$i
194 done 200 done