diff options
author | Alex Franco <alejandro.franco@linux.intel.com> | 2015-08-26 16:57:34 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-29 13:38:05 +0100 |
commit | 9b6bf6a41f630967c92dbc6644542943ff5f2305 (patch) | |
tree | 4b59e00ab785d1958a074072f9f53df92291ee86 /meta | |
parent | 013f762327bd1477ad4550f4728683f90a340844 (diff) | |
download | poky-9b6bf6a41f630967c92dbc6644542943ff5f2305.tar.gz |
Empty image: package list splitting and iteration
A few short fixes to splitting/iteration done over package lists
in license.bbclass, package_manager.py and rootfs.py.
[YOCTO #7664]
(From OE-Core rev: a902e98c5938f52ec960e0518e0ceaf8f5ee610c)
Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/license.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oe/package_manager.py | 5 | ||||
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 32e172afc7..c616a20121 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -39,7 +39,7 @@ python license_create_manifest() { | |||
39 | return 0 | 39 | return 0 |
40 | 40 | ||
41 | pkg_dic = {} | 41 | pkg_dic = {} |
42 | for pkg in image_list_installed_packages(d).split("\n"): | 42 | for pkg in image_list_installed_packages(d).splitlines(): |
43 | pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True), | 43 | pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True), |
44 | 'runtime-reverse', pkg) | 44 | 'runtime-reverse', pkg) |
45 | pkg_name = os.path.basename(os.readlink(pkg_info)) | 45 | pkg_name = os.path.basename(os.readlink(pkg_info)) |
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 2ab1d78bca..ef917f15b2 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -995,9 +995,10 @@ class RpmPM(PackageManager): | |||
995 | ''' | 995 | ''' |
996 | def install(self, pkgs, attempt_only=False): | 996 | def install(self, pkgs, attempt_only=False): |
997 | 997 | ||
998 | bb.note("Installing the following packages: %s" % ' '.join(pkgs)) | 998 | if not pkgs: |
999 | if attempt_only and len(pkgs) == 0: | 999 | bb.note("There are no packages to install") |
1000 | return | 1000 | return |
1001 | bb.note("Installing the following packages: %s" % ' '.join(pkgs)) | ||
1001 | pkgs = self._pkg_translate_oe_to_smart(pkgs, attempt_only) | 1002 | pkgs = self._pkg_translate_oe_to_smart(pkgs, attempt_only) |
1002 | 1003 | ||
1003 | if not attempt_only: | 1004 | if not attempt_only: |
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 8c8244c453..c29843b054 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -235,7 +235,7 @@ class Rootfs(object): | |||
235 | installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt') | 235 | installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt') |
236 | pkgs_to_remove = list() | 236 | pkgs_to_remove = list() |
237 | with open(installed_pkgs_dir, "r+") as installed_pkgs: | 237 | with open(installed_pkgs_dir, "r+") as installed_pkgs: |
238 | pkgs_installed = installed_pkgs.read().split('\n') | 238 | pkgs_installed = installed_pkgs.read().splitlines() |
239 | for pkg_installed in pkgs_installed[:]: | 239 | for pkg_installed in pkgs_installed[:]: |
240 | pkg = pkg_installed.split()[0] | 240 | pkg = pkg_installed.split()[0] |
241 | if pkg in ["update-rc.d", | 241 | if pkg in ["update-rc.d", |