From 4477991633d2971c17afbd0874b1ab2efb7d6eef Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 27 Jan 2014 09:41:31 +0800 Subject: 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; Signed-off-by: Hongxu Jia Signed-off-by: Laurentiu Palcu --- meta/classes/license.bbclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'meta/classes/license.bbclass') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index f075f59340..16cadf9e2c 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) -- cgit 1.2.3-korg