aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-03-09 14:39:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:38:33 +0000
commit2f99ee5725ffc173bf32c0b707aa90adbc4eed95 (patch)
treed677e8fe1231853207d066915a473ddb8f8390c5
parentf76572df61d27a7e25f8433b1bbf42a0c9032024 (diff)
downloadopenembedded-core-contrib-2f99ee5725ffc173bf32c0b707aa90adbc4eed95.tar.gz
openembedded-core-contrib-2f99ee5725ffc173bf32c0b707aa90adbc4eed95.tar.bz2
openembedded-core-contrib-2f99ee5725ffc173bf32c0b707aa90adbc4eed95.zip
nativesdk.bbclass: set PKGDATA_DIR explicitly
For now, if we enable 'multilib' and execute `bitbake uninative-tarball -c populate_sdk', the command would fail, complaining nativesdk-glibc not found in package feed. The problem is that PKGDATA_DIR is not set correctly for nativesdk packages when multilib is enabled. For now, we have: meta/conf/bitbake.conf:PKGDATA_DIR = "${STAGING_DIR_HOST}/pkgdata" The above is overriden by the following is multilib is enabled. meta/conf/multilib.conf:PKGDATA_DIR = "${STAGING_DIR}/${MACHINE}/pkgdata" This is correct for normal packages. However, for nativesdk packages, this is not correctly. This is because nativesdk.bbclass set STAGING_DIR_HOST as follows. meta/classes/nativesdk.bbclass:STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}" The above overrides the value in multilib.conf. That's why we need to also set PKGDATA_DIR explicitly in nativesdk.bbclass. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/nativesdk.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 5e78116ab86..30bcdfeb443 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -25,6 +25,7 @@ EXTRANATIVEPATH += "chrpath-native"
STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}"
STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}"
+PKGDATA_DIR = "${STAGING_DIR_HOST}/pkgdata"
HOST_ARCH = "${SDK_ARCH}"
HOST_VENDOR = "${SDK_VENDOR}"