[oe-commits] Laurentiu Palcu : image.bbclass, license.bbclass: adjust the name of list_installed_packages()
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 21 11:58:39 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 118a2a44bbe5ed2e9bbd0012970686be454e5d4c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=118a2a44bbe5ed2e9bbd0012970686be454e5d4c
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Tue Mar 18 11:17:09 2014 +0000
image.bbclass, license.bbclass: adjust the name of list_installed_packages()
The old wrapper got renamed to image_list_installed_packages().
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/image.bbclass | 4 ++--
meta/classes/license.bbclass | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 51d16d7..9a04288 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -330,9 +330,9 @@ make_zimage_symlink_relative () {
}
python write_image_manifest () {
- from oe.rootfs import list_installed_packages
+ from oe.rootfs import image_list_installed_packages
with open(d.getVar('IMAGE_MANIFEST', True), 'w+') as image_manifest:
- image_manifest.write(list_installed_packages(d, 'ver'))
+ image_manifest.write(image_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 a0b877d..08f0665 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -20,9 +20,9 @@ python write_package_manifest() {
# Get list of installed packages
license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}')
bb.utils.mkdirhier(license_image_dir)
- from oe.rootfs import list_installed_packages
+ from oe.rootfs import image_list_installed_packages
open(os.path.join(license_image_dir, 'package.manifest'),
- 'w+').write(list_installed_packages(d))
+ 'w+').write(image_list_installed_packages(d))
}
license_create_manifest() {
More information about the Openembedded-commits
mailing list