MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oe-pkgdata-util: Make parse_pkgdatafile() support package suffixed vars

Browse Source 
Support for variables suffixed with package names, e.g., PKGV_foo, was
removed in commit 3d2c87c4, which broke support for recipes that set
other versions on their packages than what is in ${PV}.

(From OE-Core rev: 38f8284212370999e1e7b0f6559f7cd786e80d1a)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2018-06-02 21:30:32 +02:00 committed by Richard Purdie
parent 762a3f229c
commit 3e9b485ba9
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/oe-pkgdata-util
View File

@ -286,36 +286,26 @@ def lookup_recipe(args):
def package_info(args):
def parse_pkgdatafile(pkgdatafile):
vars = ['PKGV', 'PKGE', 'PKGR', 'PN', 'PV', 'PE', 'PR', 'PKGSIZE']
with open(pkgdatafile, 'r') as f:
pkge = ''
pkgr = ''
pe = ''
pr = ''
vals = dict()
for line in f:
if line.startswith('PKGV:'):
pkg_version = line.split(':', 1)[1].strip()
elif line.startswith('PKGE:'):
pkge = line.split(':', 1)[1].strip()
elif line.startswith('PKGR:'):
pkgr = line.split(':', 1)[1].strip()
elif line.startswith('PN:'):
recipe = line.split(':', 1)[1].strip()
elif line.startswith('PV:'):
recipe_version = line.split(':', 1)[1].strip()
elif line.startswith('PE:'):
pe = line.split(':', 1)[1].strip()
elif line.startswith('PR:'):
pr = line.split(':', 1)[1].strip()
elif line.startswith('PKGSIZE'):
pkg_size = line.split(':', 1)[1].strip()
if pkge:
pkg_version = pkge + ":" + pkg_version
if pkgr:
pkg_version = pkg_version + "-" + pkgr
if pe:
recipe_version = pe + ":" + recipe_version
if pr:
recipe_version = recipe_version + "-" + pr
for var in vars:
m = re.match(var + '(?:_\S+)?:\s*(.+?)\s*$', line)
if m:
vals[var] = m.group(1)
pkg_version = vals['PKGV'] or ''
recipe = vals['PN'] or ''
recipe_version = vals['PV'] or ''
pkg_size = vals['PKGSIZE'] or ''
if 'PKGE' in vals:
pkg_version = vals['PKGE'] + ":" + pkg_version
if 'PKGR' in vals:
pkg_version = pkg_version + "-" + vals['PKGR']
if 'PE' in vals:
recipe_version = vals['PE'] + ":" + recipe_version
if 'PR' in vals:
recipe_version = recipe_version + "-" + vals['PR']
print("%s %s %s %s %s" % (pkg, pkg_version, recipe, recipe_version, pkg_size))
# Handle both multiple arguments and multiple values within an arg (old syntax)