diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-04-21 14:03:26 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-22 16:28:57 +0100 |
commit | a9b503b268e94d311f892fa00c5d6bd9ffdb228e (patch) | |
tree | 95e13e8f2570ee36a750569c0cef6c2c015fb768 | |
parent | 2755304a7dedf0bf07346c7c8a247b040313071a (diff) | |
download | poky-a9b503b268e94d311f892fa00c5d6bd9ffdb228e.tar.gz |
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]
(From OE-Core rev: e2dbe5eb869b8336b91023b83d7ca866197efa73)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/license.bbclass | 6 |
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): | |||
181 | key,val = line.split(": ", 1) | 181 | key,val = line.split(": ", 1) |
182 | man_dic[dep][key] = val[:-1] | 182 | man_dic[dep][key] = val[:-1] |
183 | 183 | ||
184 | image_license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY', True), | 184 | lic_manifest_dir = os.path.join(d.getVar('LICENSE_DIRECTORY', True), |
185 | d.getVar('IMAGE_NAME', True), 'image_license.manifest') | 185 | d.getVar('IMAGE_NAME', True)) |
186 | bb.utils.mkdirhier(lic_manifest_dir) | ||
187 | image_license_manifest = os.path.join(lic_manifest_dir, 'image_license.manifest') | ||
186 | write_license_files(d, image_license_manifest, man_dic) | 188 | write_license_files(d, image_license_manifest, man_dic) |
187 | 189 | ||
188 | def get_deployed_dependencies(d): | 190 | def get_deployed_dependencies(d): |