Skip to contentSkip to conversation

nativesdk.bbclass: set PKGDATA_DIR explicitly

PATCH New Chen Qi 1 participant 2 messages Mar 9, 2015

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover nativesdk.bbclass: set PKGDATA_DIR explicitly

The following changes since commit 3c78468f12296abd02abce6eeac0f69bc7509958:

build-appliance-image: Update to master head revision (2015-03-03 13:12:50 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/nativesdk-PKGDATA_DIR
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/nativesdk-PKGDATA_DIR

Chen Qi (1):
nativesdk.bbclass: set PKGDATA_DIR explicitly

 meta/classes/nativesdk.bbclass | 1 +
 1 file changed, 1 insertion(+)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/nativesdk.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/nativesdk.bbclass +1 -0
index 5e78116..30bcdfe 100644
@@ -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}"
Signature · 1 line
1.9.1