mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 18:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/oeqa: use the new manifest file for determining if a package is installed

Browse Source 
Use the new manifest file instead of ${WORKDIR}/installed_pkgs.txt for determining
if an image has a certain package, because installed_pkgs.txt goes away with rm_work
enabled.
We can't use the IMAGE_MANIFEST var for the file path because that relies on IMAGE_NAME which
changes at every run (because of date), so we use the link which points to the last
one built.

[ YOCTO #5072 ]

(From OE-Core rev: f57c83fc33583c140f668946f3f3e79b960aa9ee)

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Stanacar
2013-11-28 15:27:00 +02:00
committed by Richard Purdie
parent 1611b474b6
commit d4398d41be
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meta/lib/oeqa/oetest.py
View File

@@ -56,17 +56,11 @@ class oeTest(unittest.TestCase):
@classmethod
def hasPackage(self, pkg):
pkgfile = os.path.join(oeTest.tc.d.getVar("WORKDIR", True), "installed_pkgs.txt")
with open(pkgfile) as f:
data = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
match = re.search(pkg, data)
data.close()
if match:
manifest = os.path.join(oeTest.tc.d.getVar("DEPLOY_DIR_IMAGE", True), oeTest.tc.d.getVar("IMAGE_LINK_NAME", True) + ".manifest")
with open(manifest) as f:
data = f.read()
if re.search(pkg, data):
return True
return False
@classmethod