diff options
| author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-01-18 14:33:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:07:15 +0000 |
| commit | 6ebda8e659f678a0f4fe1e970d6f38e5e273f5f7 (patch) | |
| tree | 3f3a48a5798b58defdfc9c812705da0bf7fd40fb /meta/classes/rootfs-postcommands.bbclass | |
| parent | 03075f671c5425f08669f10f30330c4880c0d60a (diff) | |
| download | poky-6ebda8e659f678a0f4fe1e970d6f38e5e273f5f7.tar.gz | |
lib/oe/rootfs: Use list_pkgs() instead of list()
This patch changes the use list_pkgs() instead of list()
from class RpmPkgsList. The change is in two functions,
image_list_installed_packages from rootfs.py and
sdk_list_installed_packages from sdk.py.
With this change the functions calling the functions
listed above, must format the output as they required.
The formatting can be done using format_pkg_list() from
oe.utils.
The classes calling the afected functions are changed too
with this patch, to keep the same functionality using the
new data structure.
[YOCTO #7427]
(From OE-Core rev: 983ea373362514e5888bd1d7d9c4f136c94b00f2)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs-postcommands.bbclass')
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 970e9f34b1..0736d6c533 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
| @@ -207,13 +207,15 @@ insert_feed_uris () { | |||
| 207 | 207 | ||
| 208 | python write_image_manifest () { | 208 | python write_image_manifest () { |
| 209 | from oe.rootfs import image_list_installed_packages | 209 | from oe.rootfs import image_list_installed_packages |
| 210 | from oe.utils import format_pkg_list | ||
| 210 | 211 | ||
| 211 | deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True) | 212 | deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True) |
| 212 | link_name = d.getVar('IMAGE_LINK_NAME', True) | 213 | link_name = d.getVar('IMAGE_LINK_NAME', True) |
| 213 | manifest_name = d.getVar('IMAGE_MANIFEST', True) | 214 | manifest_name = d.getVar('IMAGE_MANIFEST', True) |
| 214 | 215 | ||
| 216 | pkgs = image_list_installed_packages(d) | ||
| 215 | with open(manifest_name, 'w+') as image_manifest: | 217 | with open(manifest_name, 'w+') as image_manifest: |
| 216 | image_manifest.write(image_list_installed_packages(d, 'ver')) | 218 | image_manifest.write(format_pkg_list(pkgs, "ver")) |
| 217 | image_manifest.write("\n") | 219 | image_manifest.write("\n") |
| 218 | 220 | ||
| 219 | if manifest_name is not None and os.path.exists(manifest_name): | 221 | if manifest_name is not None and os.path.exists(manifest_name): |
