summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf22
-rw-r--r--meta/conf/multilib.conf12
2 files changed, 18 insertions, 16 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c8516a800d..ee8bd8b06b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -352,8 +352,10 @@ S = "${WORKDIR}/${BP}"
352B = "${S}" 352B = "${S}"
353 353
354STAGING_DIR = "${TMPDIR}/sysroots" 354STAGING_DIR = "${TMPDIR}/sysroots"
355RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot"
356RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native"
355 357
356STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" 358STAGING_DIR_NATIVE = "${RECIPE_SYSROOT_NATIVE}"
357STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" 359STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
358STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" 360STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts"
359STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 361STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
@@ -365,7 +367,7 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
365STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 367STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
366STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" 368STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
367 369
368STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}" 370STAGING_DIR_HOST = "${RECIPE_SYSROOT}"
369STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}" 371STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
370STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}" 372STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
371STAGING_LIBEXECDIR = "${STAGING_DIR_HOST}${libexecdir}" 373STAGING_LIBEXECDIR = "${STAGING_DIR_HOST}${libexecdir}"
@@ -376,8 +378,7 @@ STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
376STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" 378STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
377STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 379STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
378 380
379STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}" 381STAGING_DIR_TARGET = "${RECIPE_SYSROOT}"
380STAGING_DIR_TCBOOTSTRAP = "${STAGING_DIR_TARGET}-tcbootstrap"
381 382
382# Setting DEPLOY_DIR outside of TMPDIR is helpful, when you are using 383# Setting DEPLOY_DIR outside of TMPDIR is helpful, when you are using
383# packaged staging and/or multimachine. 384# packaged staging and/or multimachine.
@@ -389,7 +390,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
389DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}" 390DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}"
390DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" 391DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
391 392
392PKGDATA_DIR = "${STAGING_DIR_HOST}/pkgdata" 393PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}"
393 394
394################################################################## 395##################################################################
395# SDK variables. 396# SDK variables.
@@ -630,14 +631,15 @@ SRC_URI = ""
630 631
631# Use pseudo as the fakeroot implementation 632# Use pseudo as the fakeroot implementation
632PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" 633PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"
633PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${STAGING_DIR_NATIVE}" 634PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}"
635PSEUDO_SYSROOT = "${STAGING_DIR}-components/${BUILD_ARCH}/pseudo-native"
634export PSEUDO_DISABLED = "1" 636export PSEUDO_DISABLED = "1"
635#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" 637#export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
636#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" 638#export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}"
637#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib 639#export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib
638FAKEROOTBASEENV = "PSEUDO_BINDIR=${STAGING_BINDIR_NATIVE} PSEUDO_LIBDIR=${STAGING_BINDIR_NATIVE}/../lib/pseudo/lib PSEUDO_PREFIX=${STAGING_BINDIR_NATIVE}/../../ PSEUDO_DISABLED=1" 640FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_DISABLED=1"
639FAKEROOTCMD = "${STAGING_BINDIR_NATIVE}/pseudo" 641FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo"
640FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0" 642FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_DISABLED=0"
641FAKEROOTNOENV = "PSEUDO_UNLOAD=1" 643FAKEROOTNOENV = "PSEUDO_UNLOAD=1"
642FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" 644FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}"
643PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" 645PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
@@ -811,7 +813,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DI
811 PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ 813 PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
812 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \ 814 CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE LICENSE_PATH SDKPKGSUFFIX \
813 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \ 815 WARN_QA ERROR_QA WORKDIR STAMPCLEAN PKGDATA_DIR BUILD_ARCH SSTATE_PKGARCH \
814 BB_WORKERCONTEXT" 816 BB_WORKERCONTEXT BB_LIMITEDDEPS"
815BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ 817BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
816 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ 818 SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
817 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ 819 PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 4dc0543507..e74dec81a8 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -6,9 +6,9 @@ MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR"
6 6
7MULTILIBS ??= "multilib:lib32" 7MULTILIBS ??= "multilib:lib32"
8 8
9STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" 9STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
10STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" 10STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
11PKGDATA_DIR = "${STAGING_DIR}/${MACHINE}/pkgdata" 11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
12 12
13INHERIT += "multilib_global" 13INHERIT += "multilib_global"
14 14
@@ -23,6 +23,6 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite"
23# find an allarch pkgconfig file will fail as the PKG_CONFIG_PATH only looks 23# find an allarch pkgconfig file will fail as the PKG_CONFIG_PATH only looks
24# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's 24# inside the multilib sysroot. Fix this by explicitly adding the MACHINE's
25# architecture-independent pkgconfig location to PKG_CONFIG_PATH. 25# architecture-independent pkgconfig location to PKG_CONFIG_PATH.
26PKG_CONFIG_PATH .= ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig" 26PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig"
27PKG_CONFIG_PATH[vardepsexclude] = "MACHINE datadir STAGING_DIR" 27PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR"
28PKG_CONFIG_PATH[vardepvalueexclude] = ":${STAGING_DIR}/${MACHINE}${datadir}/pkgconfig" 28PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig"