]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
populate_sdk_base: Ensure PKGDATA_DIR exists
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 23 Oct 2015 03:30:36 +0000 (20:30 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 27 Oct 2015 07:24:29 +0000 (07:24 +0000)
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 rev: 319c5d55bb0c7e429766f46dd42a15e16a43c4dd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/populate_sdk_base.bbclass

index 36876e8482f53a2f580ea2c70d6506424658fa20..35e129b0685395e6ae4776a42affec0e501f417d 100644 (file)
@@ -188,7 +188,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"