From dde51fb77f05a98e58b40717a776a2ff036d971b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 9 Mar 2026 09:03:24 +0100 Subject: [PATCH] lsb.py: strip ' from os-release file In gentoo the file looks like this: NAME='Gentoo' ID='gentoo' PRETTY_NAME='Gentoo Linux' VERSION='2.18' VERSION_ID='2.18' HOME_URL='https://www.gentoo.org/' SUPPORT_URL='https://www.gentoo.org/support/' BUG_REPORT_URL='https://bugs.gentoo.org/' ANSI_COLOR='1;32' ' were added with: https://github.com/gentoo/gentoo/commit/2f590e35c9d3d13d5673163527120b2de97fdc80 before that the os-release file looked like this: NAME=Gentoo ID=gentoo PRETTY_NAME="Gentoo Linux" ANSI_COLOR="1;32" HOME_URL="https://www.gentoo.org/" SUPPORT_URL="https://www.gentoo.org/support/" BUG_REPORT_URL="https://bugs.gentoo.org/" VERSION_ID="2.18" The ' is stripped from the ID later in distro_identifier with: # Filter out any non-alphanumerics and convert to lowercase distro_id = re.sub(r'\W', '', distro_id).lower() but not from version which results in a weird NATIVELSBSTRING like: NATIVELSBSTRING = "gentoo-'2.18'" And similarly the directory name in sstate-cache: oe-core $ ls -d sstate-cache/gentoo-* "sstate-cache/gentoo-'2.18'" sstate-cache/gentoo-2.18 (From OE-Core rev: 5786749670fc1fa17e32b9eed286630739ddbc16) Signed-off-by: Martin Jansa Signed-off-by: Yoann Congal Signed-off-by: Paul Barker --- meta/lib/oe/lsb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py index 43e46380d7..f2c3c0ff56 100644 --- a/meta/lib/oe/lsb.py +++ b/meta/lib/oe/lsb.py @@ -14,7 +14,7 @@ def get_os_release(): key, val = line.rstrip().split('=', 1) except ValueError: continue - data[key.strip()] = val.strip('"') + data[key.strip()] = val.strip('"\'') return data def release_dict_osr():