From 2f99ee5725ffc173bf32c0b707aa90adbc4eed95 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 9 Mar 2015 14:39:48 +0800 Subject: 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 Signed-off-by: Ross Burton --- meta/classes/nativesdk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 5e78116ab8..30bcdfeb44 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}" -- cgit 1.2.3-korg