From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 9 Mar 2015 03:24:42 +0000 (+0800)
Subject: nativesdk.bbclass: set PKGDATA_DIR explicitly
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FChenQi%2Fnativesdk-PKGDATA_DIR;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

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}"