On Dec 31, 2020, at 7:38 AM, Peter Kjellerstedt <peter.kjellerst...@axis.com> wrote:
>> -----Original Message----- >> From: openembedded-core@lists.openembedded.org <openembedded- >> c...@lists.openembedded.org> On Behalf Of Randy Li >> Sent: den 29 december 2020 04:56 >> To: openembedded-core@lists.openembedded.org >> Cc: Randy Li <ay...@soulik.info> >> Subject: [OE-core] [PATCH v2 1/2] meson: don't turn sting into a list in >> nativesdk > > Change "sting" to "string". > Thanks, I noted that just after I sent it, but I think maintainers or someone would correct it when it is merged. >> >> In the current version of meson, some path variables only >> accept a string not a list. >> >> Signed-off-by: Randy Li <ay...@soulik.info> >> --- >> meta/recipes-devtools/meson/meson/meson-setup.py | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-devtools/meson/meson/meson-setup.py >> b/meta/recipes-devtools/meson/meson/meson-setup.py >> index 808e2a062f..7acfe373fa 100755 >> --- a/meta/recipes-devtools/meson/meson/meson-setup.py >> +++ b/meta/recipes-devtools/meson/meson/meson-setup.py >> @@ -10,9 +10,13 @@ class Template(string.Template): >> class Environ(): >> def __getitem__(self, name): >> val = os.environ[name] >> - val = ["'%s'" % x for x in val.split()] >> - val = ', '.join(val) >> - val = '[%s]' % val >> + val = val.split() >> + if len(val) > 1: >> + val = ["'%s'" % x for x in val] >> + val = ', '.join(val) >> + val = '[%s]' % val >> + else: >> + if val: val = "'%s'" % val.pop() > > Change to: > > elif val: > val = "'%s'" % val.pop() > Nice catch, if this patch would merge for this version and not wait for the QA case, I would suggest you appended be merged. Or I would ship them in the next version with the QA case. >> return val >> >> try: >> -- >> 2.29.2 > > //Peter >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#146318): https://lists.openembedded.org/g/openembedded-core/message/146318 Mute This Topic: https://lists.openembedded.org/mt/79284745/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
