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

os-release: sanitize required fields

Browse Source 
Currently only VERSION_ID field is sanitized, but os-release (5) has
more fields with the same requirement. Moreover, those fields come
unquoted in most distributions, because quotes are not needed for a
values without whitespaces.

(From OE-Core rev: f451c68667cca8a1883ceddb66dd2834b18252a8)

Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vyacheslav Yurkov
2020-04-30 16:03:40 +02:00
committed by Richard Purdie
parent 7d2814a2b0
commit 4d98363d59
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/os-release/os-release.bb
+9 -5
View File
@@ -13,6 +13,7 @@ do_configure[noexec] = "1"
# Other valid fields: BUILD_ID ID_LIKE ANSI_COLOR CPE_NAME # Other valid fields: BUILD_ID ID_LIKE ANSI_COLOR CPE_NAME
# HOME_URL SUPPORT_URL BUG_REPORT_URL # HOME_URL SUPPORT_URL BUG_REPORT_URL
OS_RELEASE_FIELDS = "ID ID_LIKE NAME VERSION VERSION_ID PRETTY_NAME" OS_RELEASE_FIELDS = "ID ID_LIKE NAME VERSION VERSION_ID PRETTY_NAME"
OS_RELEASE_UNQUOTED_FIELDS = "ID VERSION_ID VARIANT_ID"
ID = "${DISTRO}" ID = "${DISTRO}"
NAME = "${DISTRO_NAME}" NAME = "${DISTRO_NAME}"
@@ -22,8 +23,8 @@ PRETTY_NAME = "${DISTRO_NAME} ${VERSION}"
BUILD_ID ?= "${DATETIME}" BUILD_ID ?= "${DATETIME}"
BUILD_ID[vardepsexclude] = "DATETIME" BUILD_ID[vardepsexclude] = "DATETIME"
def sanitise_version(ver): def sanitise_value(ver):
# VERSION_ID should be (from os-release(5)): # unquoted fields like VERSION_ID should be (from os-release(5)):
# lower-case string (mostly numeric, no spaces or other characters # lower-case string (mostly numeric, no spaces or other characters
# outside of 0-9, a-z, ".", "_" and "-") # outside of 0-9, a-z, ".", "_" and "-")
ret = ver.replace('+', '-').replace(' ','_') ret = ver.replace('+', '-').replace(' ','_')
@@ -32,11 +33,14 @@ def sanitise_version(ver):
python do_compile () { python do_compile () {
with open(d.expand('${B}/os-release'), 'w') as f: with open(d.expand('${B}/os-release'), 'w') as f:
for field in d.getVar('OS_RELEASE_FIELDS').split(): for field in d.getVar('OS_RELEASE_FIELDS').split():
unquotedFields = d.getVar('OS_RELEASE_UNQUOTED_FIELDS').split()
value = d.getVar(field) value = d.getVar(field)
if value and field == 'VERSION_ID':
value = sanitise_version(value)
if value: if value:
f.write('{0}="{1}"\n'.format(field, value)) if field in unquotedFields:
value = sanitise_value(value)
f.write('{0}={1}\n'.format(field, value))
else:
f.write('{0}="{1}"\n'.format(field, value))
} }
do_compile[vardeps] += "${OS_RELEASE_FIELDS}" do_compile[vardeps] += "${OS_RELEASE_FIELDS}"