summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-22 20:30:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 08:11:33 +0100
commit1992a76b89bc5091cabe765276de5e069ee31387 (patch)
treec52bd34bb4049f3506c76ec5e644855b41752552
parent5d677d7dba1a3e5e525b1068d6d2a59be4458d2c (diff)
downloadpoky-1992a76b89bc5091cabe765276de5e069ee31387.tar.gz
poky-1992a76b89bc5091cabe765276de5e069ee31387.tar.bz2
poky-1992a76b89bc5091cabe765276de5e069ee31387.zip
populate_sdk_base: Ensure PKGDATA_DIR exists
The code assumes that PKG_DATADIR exists and will fail if an image has not been generated which creates it. This occurs when something like buildtools-tarball is built which doesn't have target packages, only nativesdk ones. Since this shouldn't be fatal, workaround this by creating the missing directory. (From OE-Core master rev: 319c5d55bb0c7e429766f46dd42a15e16a43c4dd) (From OE-Core rev: d9ea863ff844ee1b84d4699b0d3af7245f3703c5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 7f7a87fdd2..40a5759843 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -166,7 +166,7 @@ populate_sdk_log_check() {
done
}
-do_populate_sdk[dirs] = "${TOPDIR}"
+do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}"
do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"