summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-04-21 14:03:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-22 16:28:47 +0100
commite2dbe5eb869b8336b91023b83d7ca866197efa73 (patch)
tree2b3cbb119be41f9f765de763ce0a55012ffb000c
parent84686b51043c5a6b0ae184d00f547ccbd7832f39 (diff)
downloadopenembedded-core-contrib-e2dbe5eb869b8336b91023b83d7ca866197efa73.tar.gz
openembedded-core-contrib-e2dbe5eb869b8336b91023b83d7ca866197efa73.tar.bz2
openembedded-core-contrib-e2dbe5eb869b8336b91023b83d7ca866197efa73.zip
license.bbclass: make sure that image manifest dir exists
Previously, write_deploy_manifest() was relying on write_package_manifest() to create the subdirectory for the manifest file. However, do_rootfs may be an empty function so that write_package_manifest() will not be called and the manifest subdirectory will not be created, causing a build failure. This patch fixes that by creating the directory hierarchy inside write_deploy_manifest(). [YOCTO #9446] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/license.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 43944e6ee6..69335d650d 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -181,8 +181,10 @@ def license_deployed_manifest(d):
key,val = line.split(": ", 1)
man_dic[dep][key] = val[:-1]
- image_license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY', True),
- d.getVar('IMAGE_NAME', True), 'image_license.manifest')
+ lic_manifest_dir = os.path.join(d.getVar('LICENSE_DIRECTORY', True),
+ d.getVar('IMAGE_NAME', True))
+ bb.utils.mkdirhier(lic_manifest_dir)
+ image_license_manifest = os.path.join(lic_manifest_dir, 'image_license.manifest')
write_license_files(d, image_license_manifest, man_dic)
def get_deployed_dependencies(d):