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

recipetool/devtool: Fix python egg whitespace issues in PACKAGECONFIG

Browse Source 
Substitute expressions or whitespace from python egg requires.txt when
generating PACKAGECONFIG

Pysetuptools sees the uvicorn.egg-info/requires.txt as extra requirements.
Recipetool parses this information to generate the PACKAGECONFIG.
These extra requirements contain expressions and whitespace, which are not allowed in PACKGAGECONFIG.
This patch substitute them by hyphens to make PACKAGECONFIG parsable and readable.
Also adding an oe-selftest for this.

[YOCTO #14446]

(From OE-Core rev: 5a1fd88439c28c473a1723a040d780f100d6295e)

Signed-off-by: Thomas Roos <throos@amazon.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a854d95a79e64f3f82abfa4cc1daec750abf4249)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Thomas Roos
2022-06-28 10:32:14 +02:00
committed by Richard Purdie
parent b2dba5ca25
commit 0b047cb6e7
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/lib/recipetool/create_buildsys_python.py
View File

@@ -209,6 +209,18 @@ class PythonRecipeHandler(RecipeHandler):
continue
if line.startswith('['):
# PACKAGECONFIG must not contain expressions or whitespace
line = line.replace(" ", "")
line = line.replace(':', "")
line = line.replace('.', "-dot-")
line = line.replace('"', "")
line = line.replace('<', "-smaller-")
line = line.replace('>', "-bigger-")
line = line.replace('_', "-")
line = line.replace('(', "")
line = line.replace(')', "")
line = line.replace('!', "-not-")
line = line.replace('=', "-equals-")
current_feature = line[1:-1]
elif current_feature:
extras_req[current_feature].append(line)
@@ -297,6 +309,7 @@ class PythonRecipeHandler(RecipeHandler):
lines_after.append('# The following configs & dependencies are from setuptools extras_require.')
lines_after.append('# These dependencies are optional, hence can be controlled via PACKAGECONFIG.')
lines_after.append('# The upstream names may not correspond exactly to bitbake package names.')
lines_after.append('# The configs are might not correct, since PACKAGECONFIG does not support expressions as may used in requires.txt - they are just replaced by text.')
lines_after.append('#')
lines_after.append('# Uncomment this line to enable all the optional features.')
lines_after.append('#PACKAGECONFIG ?= "{}"'.format(' '.join(k.lower() for k in extras_req)))