diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/signing.py')
-rw-r--r-- | meta/lib/oeqa/selftest/signing.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/signing.py b/meta/lib/oeqa/selftest/signing.py index 35c2dc12ab..006afbef15 100644 --- a/meta/lib/oeqa/selftest/signing.py +++ b/meta/lib/oeqa/selftest/signing.py | |||
@@ -1,5 +1,5 @@ | |||
1 | from oeqa.selftest.base import oeSelfTest | 1 | from oeqa.selftest.base import oeSelfTest |
2 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var | 2 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars |
3 | import os | 3 | import os |
4 | import glob | 4 | import glob |
5 | import re | 5 | import re |
@@ -59,15 +59,17 @@ class Signing(oeSelfTest): | |||
59 | 59 | ||
60 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) | 60 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) |
61 | 61 | ||
62 | pkgdatadir = get_bb_var('PKGDATA_DIR', test_recipe) | 62 | needed_vars = ['PKGDATA_DIR', 'DEPLOY_DIR_RPM', 'PACKAGE_ARCH', 'STAGING_BINDIR_NATIVE'] |
63 | bb_vars = get_bb_vars(needed_vars, test_recipe) | ||
64 | pkgdatadir = bb_vars['PKGDATA_DIR'] | ||
63 | pkgdata = oe.packagedata.read_pkgdatafile(pkgdatadir + "/runtime/ed") | 65 | pkgdata = oe.packagedata.read_pkgdatafile(pkgdatadir + "/runtime/ed") |
64 | if 'PKGE' in pkgdata: | 66 | if 'PKGE' in pkgdata: |
65 | pf = pkgdata['PN'] + "-" + pkgdata['PKGE'] + pkgdata['PKGV'] + '-' + pkgdata['PKGR'] | 67 | pf = pkgdata['PN'] + "-" + pkgdata['PKGE'] + pkgdata['PKGV'] + '-' + pkgdata['PKGR'] |
66 | else: | 68 | else: |
67 | pf = pkgdata['PN'] + "-" + pkgdata['PKGV'] + '-' + pkgdata['PKGR'] | 69 | pf = pkgdata['PN'] + "-" + pkgdata['PKGV'] + '-' + pkgdata['PKGR'] |
68 | deploy_dir_rpm = get_bb_var('DEPLOY_DIR_RPM', test_recipe) | 70 | deploy_dir_rpm = bb_vars['DEPLOY_DIR_RPM'] |
69 | package_arch = get_bb_var('PACKAGE_ARCH', test_recipe).replace('-', '_') | 71 | package_arch = bb_vars['PACKAGE_ARCH'].replace('-', '_') |
70 | staging_bindir_native = get_bb_var('STAGING_BINDIR_NATIVE', test_recipe) | 72 | staging_bindir_native = bb_vars['STAGING_BINDIR_NATIVE'] |
71 | 73 | ||
72 | pkg_deploy = os.path.join(deploy_dir_rpm, package_arch, '.'.join((pf, package_arch, 'rpm'))) | 74 | pkg_deploy = os.path.join(deploy_dir_rpm, package_arch, '.'.join((pf, package_arch, 'rpm'))) |
73 | 75 | ||