bitbake.conf: Add COMPONENTS_DIR for ${STAGING_DIR}-components
The path to where to install and find the sysroot components is used in many places. This warrants it to get its own variable. (From OE-Core rev: 70a84b525470f72339568409daf84845904e4cab) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3e655f9c7f
commit
439bb8cc71
|
@ -95,7 +95,7 @@ libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
|
||||||
libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
|
libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
|
||||||
|
|
||||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/"
|
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/"
|
||||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
|
do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
|
||||||
|
|
||||||
# Since we actually install these into situ there is no staging prefix
|
# Since we actually install these into situ there is no staging prefix
|
||||||
STAGING_DIR_HOST = ""
|
STAGING_DIR_HOST = ""
|
||||||
|
|
|
@ -201,8 +201,8 @@ do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}"
|
||||||
SSTATETASKS += "do_populate_sysroot"
|
SSTATETASKS += "do_populate_sysroot"
|
||||||
do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}"
|
do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}"
|
||||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}"
|
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}"
|
||||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
|
do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
|
||||||
do_populate_sysroot[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
|
do_populate_sysroot[sstate-fixmedir] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
|
||||||
|
|
||||||
python do_populate_sysroot_setscene () {
|
python do_populate_sysroot_setscene () {
|
||||||
sstate_setscene(d)
|
sstate_setscene(d)
|
||||||
|
@ -442,7 +442,7 @@ python extend_recipe_sysroot() {
|
||||||
bb.note("\n".join(msgbuf))
|
bb.note("\n".join(msgbuf))
|
||||||
|
|
||||||
stagingdir = d.getVar("STAGING_DIR")
|
stagingdir = d.getVar("STAGING_DIR")
|
||||||
sharedmanifests = stagingdir + "-components/manifests"
|
sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
|
||||||
recipesysroot = d.getVar("RECIPE_SYSROOT")
|
recipesysroot = d.getVar("RECIPE_SYSROOT")
|
||||||
recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
|
recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
|
||||||
current_variant = d.getVar("BBEXTENDVARIANT")
|
current_variant = d.getVar("BBEXTENDVARIANT")
|
||||||
|
|
|
@ -351,6 +351,7 @@ S = "${WORKDIR}/${BP}"
|
||||||
B = "${S}"
|
B = "${S}"
|
||||||
|
|
||||||
STAGING_DIR = "${TMPDIR}/sysroots"
|
STAGING_DIR = "${TMPDIR}/sysroots"
|
||||||
|
COMPONENTS_DIR = "${STAGING_DIR}-components"
|
||||||
RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot"
|
RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot"
|
||||||
RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native"
|
RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native"
|
||||||
|
|
||||||
|
@ -655,7 +656,7 @@ SRC_URI = ""
|
||||||
# Use pseudo as the fakeroot implementation
|
# Use pseudo as the fakeroot implementation
|
||||||
PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
|
PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
|
||||||
PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}"
|
PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}"
|
||||||
PSEUDO_SYSROOT = "${STAGING_DIR}-components/${BUILD_ARCH}/pseudo-native"
|
PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native"
|
||||||
export PSEUDO_DISABLED = "1"
|
export PSEUDO_DISABLED = "1"
|
||||||
#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
|
#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
|
||||||
#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
|
#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
|
||||||
|
|
|
@ -294,7 +294,7 @@ class DevtoolTests(DevtoolBase):
|
||||||
f.write('\nFILES_${PN}-dev += "${datadir}/cmake/Modules"\n')
|
f.write('\nFILES_${PN}-dev += "${datadir}/cmake/Modules"\n')
|
||||||
# We don't have the ability to pick up this dependency automatically yet...
|
# We don't have the ability to pick up this dependency automatically yet...
|
||||||
f.write('\nDEPENDS += "libusb1"\n')
|
f.write('\nDEPENDS += "libusb1"\n')
|
||||||
f.write('\nTESTLIBOUTPUT = "${STAGING_DIR}-components/${TUNE_PKGARCH}/${PN}/${libdir}"\n')
|
f.write('\nTESTLIBOUTPUT = "${COMPONENTS_DIR}/${TUNE_PKGARCH}/${PN}/${libdir}"\n')
|
||||||
# Test devtool build
|
# Test devtool build
|
||||||
result = runCmd('devtool build libftdi')
|
result = runCmd('devtool build libftdi')
|
||||||
bb_vars = get_bb_vars(['TESTLIBOUTPUT', 'STAMP'], 'libftdi')
|
bb_vars = get_bb_vars(['TESTLIBOUTPUT', 'STAMP'], 'libftdi')
|
||||||
|
|
|
@ -66,7 +66,7 @@ DESCRIPTION_localedef = "glibc: compile locale definition files"
|
||||||
FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*"
|
FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*"
|
||||||
FILES_localedef = "${bindir}/localedef"
|
FILES_localedef = "${bindir}/localedef"
|
||||||
|
|
||||||
LOCALETREESRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale"
|
LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
|
mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
|
||||||
|
|
|
@ -5,7 +5,7 @@ DESCRIPTION = "mtrace utility provided by glibc"
|
||||||
RDEPENDS_${PN} = "perl"
|
RDEPENDS_${PN} = "perl"
|
||||||
RPROVIDES_${PN} = "libc-mtrace"
|
RPROVIDES_${PN} = "libc-mtrace"
|
||||||
|
|
||||||
SRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
|
SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d -m 0755 ${D}${bindir}
|
install -d -m 0755 ${D}${bindir}
|
||||||
|
|
|
@ -198,8 +198,8 @@ do_stash_locale[dirs] = "${B}"
|
||||||
do_stash_locale[cleandirs] = "${LOCALESTASH}"
|
do_stash_locale[cleandirs] = "${LOCALESTASH}"
|
||||||
SSTATETASKS += "do_stash_locale"
|
SSTATETASKS += "do_stash_locale"
|
||||||
do_stash_locale[sstate-inputdirs] = "${LOCALESTASH}"
|
do_stash_locale[sstate-inputdirs] = "${LOCALESTASH}"
|
||||||
do_stash_locale[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale"
|
do_stash_locale[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
|
||||||
do_stash_locale[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale"
|
do_stash_locale[sstate-fixmedir] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
|
||||||
|
|
||||||
python do_stash_locale_setscene () {
|
python do_stash_locale_setscene () {
|
||||||
sstate_setscene(d)
|
sstate_setscene(d)
|
||||||
|
|
|
@ -4,7 +4,7 @@ SUMMARY = "utility scripts provided by glibc"
|
||||||
DESCRIPTION = "utility scripts provided by glibc"
|
DESCRIPTION = "utility scripts provided by glibc"
|
||||||
RDEPENDS_${PN} = "bash glibc-mtrace"
|
RDEPENDS_${PN} = "bash glibc-mtrace"
|
||||||
|
|
||||||
SRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
|
SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
|
||||||
|
|
||||||
bashscripts = "sotruss xtrace"
|
bashscripts = "sotruss xtrace"
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc${COMPILERINITIAL}:do_gcc_s
|
||||||
COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc${COMPILERINITIAL}-crosssdk:do_gcc_stash_builddir"
|
COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc${COMPILERINITIAL}-crosssdk:do_gcc_stash_builddir"
|
||||||
|
|
||||||
python extract_stashed_builddir () {
|
python extract_stashed_builddir () {
|
||||||
src = d.expand("${STAGING_DIR}-components/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}")
|
src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}")
|
||||||
dest = d.getVar("B")
|
dest = d.getVar("B")
|
||||||
oe.path.copyhardlinktree(src, dest)
|
oe.path.copyhardlinktree(src, dest)
|
||||||
staging_processfixme([src + "/fixmepath"], dest, dest, dest, d)
|
staging_processfixme([src + "/fixmepath"], dest, dest, dest, d)
|
||||||
|
|
|
@ -77,7 +77,7 @@ sysroot_stage_all() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/"
|
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/"
|
||||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}"
|
do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
|
||||||
|
|
||||||
inherit nopackages
|
inherit nopackages
|
||||||
|
|
||||||
|
|
|
@ -206,8 +206,8 @@ do_gcc_stash_builddir () {
|
||||||
addtask do_gcc_stash_builddir after do_compile before do_install
|
addtask do_gcc_stash_builddir after do_compile before do_install
|
||||||
SSTATETASKS += "do_gcc_stash_builddir"
|
SSTATETASKS += "do_gcc_stash_builddir"
|
||||||
do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
|
do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
|
||||||
do_gcc_stash_builddir[sstate-outputdirs] = "${STAGING_DIR}-components/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
|
do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
|
||||||
do_gcc_stash_builddir[sstate-fixmedir] = "${STAGING_DIR}-components/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
|
do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
|
||||||
|
|
||||||
python do_gcc_stash_builddir_setscene () {
|
python do_gcc_stash_builddir_setscene () {
|
||||||
sstate_setscene(d)
|
sstate_setscene(d)
|
||||||
|
|
|
@ -111,8 +111,8 @@ guile_cross_config() {
|
||||||
# auto-compile into the prefix even if it can write there, so touch them here as
|
# auto-compile into the prefix even if it can write there, so touch them here as
|
||||||
# sysroot is managed.
|
# sysroot is managed.
|
||||||
SSTATEPOSTINSTFUNCS += "guile_sstate_postinst"
|
SSTATEPOSTINSTFUNCS += "guile_sstate_postinst"
|
||||||
GUILESSTATEDIR = "${STAGING_DIR}-components/${TUNE_PKGARCH}/${PN}/${libdir}/guile/2.0/ccache"
|
GUILESSTATEDIR = "${COMPONENTS_DIR}/${TUNE_PKGARCH}/${PN}/${libdir}/guile/2.0/ccache"
|
||||||
GUILESSTATEDIR_class-native = "${STAGING_DIR}-components/${BUILD_ARCH}/${PN}/${libdir_native}/guile/2.0/ccache"
|
GUILESSTATEDIR_class-native = "${COMPONENTS_DIR}/${BUILD_ARCH}/${PN}/${libdir_native}/guile/2.0/ccache"
|
||||||
guile_sstate_postinst() {
|
guile_sstate_postinst() {
|
||||||
if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
|
if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue