diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-03-18 11:17:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-21 12:05:53 +0000 |
| commit | 0ec27e63a358013d52b5015b5386ef738271460e (patch) | |
| tree | 3e5a4c6e7ce849ba90a14ee53cb484c3213495c9 | |
| parent | 483d5a4f3101e51ae495f8473b494a94cefa1a0f (diff) | |
| download | poky-0ec27e63a358013d52b5015b5386ef738271460e.tar.gz | |
image.bbclass, license.bbclass: adjust the name of list_installed_packages()
The old wrapper got renamed to image_list_installed_packages().
(From OE-Core rev: 118a2a44bbe5ed2e9bbd0012970686be454e5d4c)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 4 | ||||
| -rw-r--r-- | 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 51d16d7d55..9a04288ba6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -330,9 +330,9 @@ make_zimage_symlink_relative () { | |||
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | python write_image_manifest () { | 332 | python write_image_manifest () { |
| 333 | from oe.rootfs import list_installed_packages | 333 | from oe.rootfs import image_list_installed_packages |
| 334 | with open(d.getVar('IMAGE_MANIFEST', True), 'w+') as image_manifest: | 334 | with open(d.getVar('IMAGE_MANIFEST', True), 'w+') as image_manifest: |
| 335 | image_manifest.write(list_installed_packages(d, 'ver')) | 335 | image_manifest.write(image_list_installed_packages(d, 'ver')) |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | # Make login manager(s) enable automatic login. | 338 | # Make login manager(s) enable automatic login. |
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index a0b877d341..08f0665e7d 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
| @@ -20,9 +20,9 @@ python write_package_manifest() { | |||
| 20 | # Get list of installed packages | 20 | # Get list of installed packages |
| 21 | license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}') | 21 | license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}') |
| 22 | bb.utils.mkdirhier(license_image_dir) | 22 | bb.utils.mkdirhier(license_image_dir) |
| 23 | from oe.rootfs import list_installed_packages | 23 | from oe.rootfs import image_list_installed_packages |
| 24 | open(os.path.join(license_image_dir, 'package.manifest'), | 24 | open(os.path.join(license_image_dir, 'package.manifest'), |
| 25 | 'w+').write(list_installed_packages(d)) | 25 | 'w+').write(image_list_installed_packages(d)) |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | license_create_manifest() { | 28 | license_create_manifest() { |
