sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Alex Franco 2015-08-26 16:57:34 -05:00 committed by Richard Purdie
parent 013f762327
commit 9b6bf6a41f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/license.bbclass
View File

@ -39,7 +39,7 @@ python license_create_manifest() {
return 0
pkg_dic = {}
for pkg in image_list_installed_packages(d).split("\n"):
for pkg in image_list_installed_packages(d).splitlines():
pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True),
'runtime-reverse', pkg)
pkg_name = os.path.basename(os.readlink(pkg_info))

5
meta/lib/oe/package_manager.py
View File

@ -995,9 +995,10 @@ class RpmPM(PackageManager):
'''
def install(self, pkgs, attempt_only=False):
bb.note("Installing the following packages: %s" % ' '.join(pkgs))
if attempt_only and len(pkgs) == 0:
if not pkgs:
bb.note("There are no packages to install")
return
bb.note("Installing the following packages: %s" % ' '.join(pkgs))
pkgs = self._pkg_translate_oe_to_smart(pkgs, attempt_only)
if not attempt_only:

2
meta/lib/oe/rootfs.py
View File

@ -235,7 +235,7 @@ class Rootfs(object):
installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt')
pkgs_to_remove = list()
with open(installed_pkgs_dir, "r+") as installed_pkgs:
pkgs_installed = installed_pkgs.read().split('\n')
pkgs_installed = installed_pkgs.read().splitlines()
for pkg_installed in pkgs_installed[:]:
pkg = pkg_installed.split()[0]
if pkg in ["update-rc.d",