aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/license.bbclass
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-01-27 09:41:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:53:42 +0000
commit1a1ba04df7eed2f12ea65e75f65a7442dddc8103 (patch)
treeffe43855f59ddce12e3e29878c0b2affdc6b47d1 /meta/classes/license.bbclass
parentf5d35ab6405e556badf54ae6f6c5138245e42ae6 (diff)
downloadopenembedded-core-contrib-1a1ba04df7eed2f12ea65e75f65a7442dddc8103.tar.gz
image.bbclass/license.bbclass: ajustment list_installed_packages invoking
Since the list_installed_packages() function has refactored in python, do the necessary adjustments to license_create_manifes- t() and write_image_manifest() in license.bbclass and image.bb- class respectively; (From OE-Core rev: 4477991633d2971c17afbd0874b1ab2efb7d6eef) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r--meta/classes/license.bbclass14
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index f075f593408..16cadf9e2cf 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -16,10 +16,16 @@ addtask populate_lic after do_patch before do_build
do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}"
do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
-license_create_manifest() {
- mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
+python write_package_manifest() {
# Get list of installed packages
- list_installed_packages |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
+ license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}')
+ bb.utils.mkdirhier(license_image_dir)
+ from oe.rootfs import list_installed_packages
+ open(os.path.join(license_image_dir, 'package.manifest'),
+ 'w+').write(list_installed_packages(d))
+}
+
+license_create_manifest() {
INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
# remove existing license.manifest file
@@ -354,7 +360,7 @@ SSTATETASKS += "do_populate_lic"
do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/"
-ROOTFS_POSTPROCESS_COMMAND_prepend = "license_create_manifest; "
+ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; "
python do_populate_lic_setscene () {
sstate_setscene(d)