[oe-commits] [openembedded-core] 07/07: license.bbclass: make sure that image manifest dir exists

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit e2dbe5eb869b8336b91023b83d7ca866197efa73
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Thu Apr 21 14:03:26 2016 +0300

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/license.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 43944e6..69335d6 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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.