mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

oe: Fix opkg status list parse - Missing postinst

Browse Source 
While parsing opkg package status, last package status was not
properly handled, resulting in final image without postinst and
pkg depends

(From OE-Core rev: 0d3ca08347eb0c8b9615a0197c213a32f52033c8)

Signed-off-by: Raul Martins <raul.martins@alta-rt.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Raul Martins
2018-12-12 05:38:19 -02:00
committed by Richard Purdie
parent 2e8f8d7eb3
commit f7ef271db5
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/rootfs.py
+15 -3
View File
@@ -519,17 +519,29 @@ class DpkgOpkgRootfs(Rootfs):
m_status = re.match("^Status:.*unpacked", line) m_status = re.match("^Status:.*unpacked", line)
m_depends = re.match("^Depends: (.*)", line) m_depends = re.match("^Depends: (.*)", line)
#Only one of m_pkg, m_status or m_depends is not None at time
#If m_pkg is not None, we started a new package
if m_pkg is not None: if m_pkg is not None:
if pkg_name and pkg_status_match: #Get Package name
pkgs[pkg_name] = _get_pkg_depends_list(pkg_depends)
pkg_name = m_pkg.group(1) pkg_name = m_pkg.group(1)
#Make sure we reset other variables
pkg_status_match = False pkg_status_match = False
pkg_depends = "" pkg_depends = ""
elif m_status is not None: elif m_status is not None:
#New status matched
pkg_status_match = True pkg_status_match = True
elif m_depends is not None: elif m_depends is not None:
#New depends macthed
pkg_depends = m_depends.group(1) pkg_depends = m_depends.group(1)
else:
pass
#Now check if we can process package depends and postinst
if "" != pkg_name and pkg_status_match:
pkgs[pkg_name] = _get_pkg_depends_list(pkg_depends)
else:
#Not enough information
pass
# remove package dependencies not in postinsts # remove package dependencies not in postinsts
pkg_names = list(pkgs.keys()) pkg_names = list(pkgs.keys())