mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
recipetool/devtool: Fix python egg whitespace issues in PACKAGECONFIG
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: a854d95a79e64f3f82abfa4cc1daec750abf4249) 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>
This commit is contained in:
committed by
Richard Purdie
parent
6958024ed2
commit
603652a38e
@@ -444,7 +444,7 @@ class DevtoolAddTests(DevtoolBase):
|
||||
checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
|
||||
checkvars['SRC_URI'] = url
|
||||
self._test_recipe_contents(recipefile, checkvars, [])
|
||||
|
||||
|
||||
def test_devtool_add_fetch_git(self):
|
||||
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
|
||||
self.track_for_cleanup(tempdir)
|
||||
@@ -544,6 +544,19 @@ class DevtoolAddTests(DevtoolBase):
|
||||
# Test devtool build
|
||||
result = runCmd('devtool build %s' % pn)
|
||||
|
||||
def test_devtool_add_python_egg_requires(self):
|
||||
# Fetch source
|
||||
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
|
||||
self.track_for_cleanup(tempdir)
|
||||
testver = '0.14.0'
|
||||
url = 'https://files.pythonhosted.org/packages/e9/9e/25d59f5043cf763833b2581c8027fa92342c4cf8ee523b498ecdf460c16d/uvicorn-%s.tar.gz' % testver
|
||||
testrecipe = 'python3-uvicorn'
|
||||
srcdir = os.path.join(tempdir, testrecipe)
|
||||
# Test devtool add
|
||||
self.track_for_cleanup(self.workspacedir)
|
||||
self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
|
||||
result = runCmd('devtool add %s %s -f %s' % (testrecipe, srcdir, url))
|
||||
|
||||
class DevtoolModifyTests(DevtoolBase):
|
||||
|
||||
def test_devtool_modify(self):
|
||||
|
||||
Reference in New Issue
Block a user