summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-05-03 21:13:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 15:55:59 (GMT)
commit439bb8cc711799b45a7f14dc8bcb1d524d993ab2 (patch)
treebc32469f2430d7ba41aedaba6124956fcd3e4062
parent3e655f9c7f0f4f778dc9eedd9f7405fc84b4c9ad (diff)
downloadpoky-439bb8cc711799b45a7f14dc8bcb1d524d993ab2.tar.gz
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>
-rw-r--r--meta/classes/native.bbclass2
-rw-r--r--meta/classes/staging.bbclass6
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/lib/oeqa/selftest/devtool.py2
-rw-r--r--meta/recipes-core/glibc/glibc-locale.inc2
-rw-r--r--meta/recipes-core/glibc/glibc-mtrace.inc2
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc4
-rw-r--r--meta/recipes-core/glibc/glibc-scripts.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc4
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.14.bb4
12 files changed, 18 insertions, 17 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index aec1087..b8f839a 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -95,7 +95,7 @@ libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
95libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 95libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
96 96
97do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" 97do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/"
98do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" 98do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
99 99
100# Since we actually install these into situ there is no staging prefix 100# Since we actually install these into situ there is no staging prefix
101STAGING_DIR_HOST = "" 101STAGING_DIR_HOST = ""
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 4015dd7..31cd625 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -201,8 +201,8 @@ do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}"
201SSTATETASKS += "do_populate_sysroot" 201SSTATETASKS += "do_populate_sysroot"
202do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" 202do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}"
203do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" 203do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}"
204do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" 204do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
205do_populate_sysroot[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" 205do_populate_sysroot[sstate-fixmedir] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
206 206
207python do_populate_sysroot_setscene () { 207python do_populate_sysroot_setscene () {
208 sstate_setscene(d) 208 sstate_setscene(d)
@@ -442,7 +442,7 @@ python extend_recipe_sysroot() {
442 bb.note("\n".join(msgbuf)) 442 bb.note("\n".join(msgbuf))
443 443
444 stagingdir = d.getVar("STAGING_DIR") 444 stagingdir = d.getVar("STAGING_DIR")
445 sharedmanifests = stagingdir + "-components/manifests" 445 sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
446 recipesysroot = d.getVar("RECIPE_SYSROOT") 446 recipesysroot = d.getVar("RECIPE_SYSROOT")
447 recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") 447 recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
448 current_variant = d.getVar("BBEXTENDVARIANT") 448 current_variant = d.getVar("BBEXTENDVARIANT")
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a24be05..2dd2bb1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -351,6 +351,7 @@ S = "${WORKDIR}/${BP}"
351B = "${S}" 351B = "${S}"
352 352
353STAGING_DIR = "${TMPDIR}/sysroots" 353STAGING_DIR = "${TMPDIR}/sysroots"
354COMPONENTS_DIR = "${STAGING_DIR}-components"
354RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot" 355RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot"
355RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native" 356RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native"
356 357
@@ -655,7 +656,7 @@ SRC_URI = ""
655# Use pseudo as the fakeroot implementation 656# Use pseudo as the fakeroot implementation
656PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 657PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
657PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" 658PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}"
658PSEUDO_SYSROOT = "${STAGING_DIR}-components/${BUILD_ARCH}/pseudo-native" 659PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native"
659export PSEUDO_DISABLED = "1" 660export PSEUDO_DISABLED = "1"
660#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" 661#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
661#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" 662#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 8e7642c..5704866 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -294,7 +294,7 @@ class DevtoolTests(DevtoolBase):
294 f.write('\nFILES_${PN}-dev += "${datadir}/cmake/Modules"\n') 294 f.write('\nFILES_${PN}-dev += "${datadir}/cmake/Modules"\n')
295 # We don't have the ability to pick up this dependency automatically yet... 295 # We don't have the ability to pick up this dependency automatically yet...
296 f.write('\nDEPENDS += "libusb1"\n') 296 f.write('\nDEPENDS += "libusb1"\n')
297 f.write('\nTESTLIBOUTPUT = "${STAGING_DIR}-components/${TUNE_PKGARCH}/${PN}/${libdir}"\n') 297 f.write('\nTESTLIBOUTPUT = "${COMPONENTS_DIR}/${TUNE_PKGARCH}/${PN}/${libdir}"\n')
298 # Test devtool build 298 # Test devtool build
299 result = runCmd('devtool build libftdi') 299 result = runCmd('devtool build libftdi')
300 bb_vars = get_bb_vars(['TESTLIBOUTPUT', 'STAMP'], 'libftdi') 300 bb_vars = get_bb_vars(['TESTLIBOUTPUT', 'STAMP'], 'libftdi')
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc
index 9c99741..70e2b3a 100644
--- a/meta/recipes-core/glibc/glibc-locale.inc
+++ b/meta/recipes-core/glibc/glibc-locale.inc
@@ -66,7 +66,7 @@ DESCRIPTION_localedef = "glibc: compile locale definition files"
66FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" 66FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*"
67FILES_localedef = "${bindir}/localedef" 67FILES_localedef = "${bindir}/localedef"
68 68
69LOCALETREESRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale" 69LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
70 70
71do_install () { 71do_install () {
72 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} 72 mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
diff --git a/meta/recipes-core/glibc/glibc-mtrace.inc b/meta/recipes-core/glibc/glibc-mtrace.inc
index d3641b3..d703c14 100644
--- a/meta/recipes-core/glibc/glibc-mtrace.inc
+++ b/meta/recipes-core/glibc/glibc-mtrace.inc
@@ -5,7 +5,7 @@ DESCRIPTION = "mtrace utility provided by glibc"
5RDEPENDS_${PN} = "perl" 5RDEPENDS_${PN} = "perl"
6RPROVIDES_${PN} = "libc-mtrace" 6RPROVIDES_${PN} = "libc-mtrace"
7 7
8SRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale/scripts" 8SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
9 9
10do_install() { 10do_install() {
11 install -d -m 0755 ${D}${bindir} 11 install -d -m 0755 ${D}${bindir}
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 2ca5666..9f7fa62 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -198,8 +198,8 @@ do_stash_locale[dirs] = "${B}"
198do_stash_locale[cleandirs] = "${LOCALESTASH}" 198do_stash_locale[cleandirs] = "${LOCALESTASH}"
199SSTATETASKS += "do_stash_locale" 199SSTATETASKS += "do_stash_locale"
200do_stash_locale[sstate-inputdirs] = "${LOCALESTASH}" 200do_stash_locale[sstate-inputdirs] = "${LOCALESTASH}"
201do_stash_locale[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale" 201do_stash_locale[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
202do_stash_locale[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale" 202do_stash_locale[sstate-fixmedir] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale"
203 203
204python do_stash_locale_setscene () { 204python do_stash_locale_setscene () {
205 sstate_setscene(d) 205 sstate_setscene(d)
diff --git a/meta/recipes-core/glibc/glibc-scripts.inc b/meta/recipes-core/glibc/glibc-scripts.inc
index 42616f0..2a2b415 100644
--- a/meta/recipes-core/glibc/glibc-scripts.inc
+++ b/meta/recipes-core/glibc/glibc-scripts.inc
@@ -4,7 +4,7 @@ SUMMARY = "utility scripts provided by glibc"
4DESCRIPTION = "utility scripts provided by glibc" 4DESCRIPTION = "utility scripts provided by glibc"
5RDEPENDS_${PN} = "bash glibc-mtrace" 5RDEPENDS_${PN} = "bash glibc-mtrace"
6 6
7SRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale/scripts" 7SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts"
8 8
9bashscripts = "sotruss xtrace" 9bashscripts = "sotruss xtrace"
10 10
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 74578d9..18dc3a6 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -13,7 +13,7 @@ COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc${COMPILERINITIAL}:do_gcc_s
13COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc${COMPILERINITIAL}-crosssdk:do_gcc_stash_builddir" 13COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc${COMPILERINITIAL}-crosssdk:do_gcc_stash_builddir"
14 14
15python extract_stashed_builddir () { 15python extract_stashed_builddir () {
16 src = d.expand("${STAGING_DIR}-components/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}") 16 src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}")
17 dest = d.getVar("B") 17 dest = d.getVar("B")
18 oe.path.copyhardlinktree(src, dest) 18 oe.path.copyhardlinktree(src, dest)
19 staging_processfixme([src + "/fixmepath"], dest, dest, dest, d) 19 staging_processfixme([src + "/fixmepath"], dest, dest, dest, d)
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index d440d88..9502c2b 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -77,7 +77,7 @@ sysroot_stage_all() {
77} 77}
78 78
79do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/" 79do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/"
80do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/${PN}" 80do_populate_sysroot[sstate-outputdirs] = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/${PN}"
81 81
82inherit nopackages 82inherit nopackages
83 83
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index c5c1645..45985c3 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -206,8 +206,8 @@ do_gcc_stash_builddir () {
206addtask do_gcc_stash_builddir after do_compile before do_install 206addtask do_gcc_stash_builddir after do_compile before do_install
207SSTATETASKS += "do_gcc_stash_builddir" 207SSTATETASKS += "do_gcc_stash_builddir"
208do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}" 208do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
209do_gcc_stash_builddir[sstate-outputdirs] = "${STAGING_DIR}-components/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}" 209do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
210do_gcc_stash_builddir[sstate-fixmedir] = "${STAGING_DIR}-components/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}" 210do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir${COMPILERINITIAL}-${TARGET_SYS}"
211 211
212python do_gcc_stash_builddir_setscene () { 212python do_gcc_stash_builddir_setscene () {
213 sstate_setscene(d) 213 sstate_setscene(d)
diff --git a/meta/recipes-devtools/guile/guile_2.0.14.bb b/meta/recipes-devtools/guile/guile_2.0.14.bb
index 7a36ba0..7a01d0f 100644
--- a/meta/recipes-devtools/guile/guile_2.0.14.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.14.bb
@@ -111,8 +111,8 @@ guile_cross_config() {
111# auto-compile into the prefix even if it can write there, so touch them here as 111# auto-compile into the prefix even if it can write there, so touch them here as
112# sysroot is managed. 112# sysroot is managed.
113SSTATEPOSTINSTFUNCS += "guile_sstate_postinst" 113SSTATEPOSTINSTFUNCS += "guile_sstate_postinst"
114GUILESSTATEDIR = "${STAGING_DIR}-components/${TUNE_PKGARCH}/${PN}/${libdir}/guile/2.0/ccache" 114GUILESSTATEDIR = "${COMPONENTS_DIR}/${TUNE_PKGARCH}/${PN}/${libdir}/guile/2.0/ccache"
115GUILESSTATEDIR_class-native = "${STAGING_DIR}-components/${BUILD_ARCH}/${PN}/${libdir_native}/guile/2.0/ccache" 115GUILESSTATEDIR_class-native = "${COMPONENTS_DIR}/${BUILD_ARCH}/${PN}/${libdir_native}/guile/2.0/ccache"
116guile_sstate_postinst() { 116guile_sstate_postinst() {
117 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] 117 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
118 then 118 then