diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-01-27 09:41:31 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:50:29 +0000 |
| commit | 4477991633d2971c17afbd0874b1ab2efb7d6eef (patch) | |
| tree | 480d0e8178266c25e6e3721148d190c52a3882e3 /meta/classes | |
| parent | dd3418e2db732ca1bc78fd93efa3f08da88a1183 (diff) | |
| download | openembedded-core-4477991633d2971c17afbd0874b1ab2efb7d6eef.tar.gz openembedded-core-4477991633d2971c17afbd0874b1ab2efb7d6eef.tar.bz2 openembedded-core-4477991633d2971c17afbd0874b1ab2efb7d6eef.zip | |
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 <hongxu.jia@windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/license.bbclass | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 04eb7f9510..e5ec42ce3d 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -343,8 +343,10 @@ make_zimage_symlink_relative () { fi } -write_image_manifest () { - list_installed_packages ver | sort > ${IMAGE_MANIFEST} +python write_image_manifest () { + from oe.rootfs import list_installed_packages + with open(d.getVar('IMAGE_MANIFEST', True), 'w+') as image_manifest: + image_manifest.write(list_installed_packages(d, 'ver')) } # Make login manager(s) enable automatic login. 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) |