From bacdb99a424fd96e5e60b740e1910163daa74aef Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 29 Mar 2013 11:19:01 +0200 Subject: meta/lib/oe/lsb.py: fix data extraction from /etc/lsb-release In some cases, /etc/lsb-release file is used to extract info about poky build host machine. But the strings are not stripped of end of line special characters. As such, when this info is concatenated and used as a directory entry in sstate_cache, this is an issue. Usually, this issue is masked by the fact that distro related info is extracted from the output of lsb_release command. In case of Yocto Linux, running "lsb_release -a" will give an error code because CODENAME info is not present. As such, bitbake will extract the info from /etc/lsb-release, running into the above issue. Consequence is that building under BA will crash. Partial fix for [YOCTO #4071] (From OE-Core rev: 5d0839bef631dceb4395fcf204779a76966a1061) Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- meta/lib/oe/lsb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib/oe/lsb.py') diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py index f4a5ba1c17..ebf90baace 100644 --- a/meta/lib/oe/lsb.py +++ b/meta/lib/oe/lsb.py @@ -26,7 +26,7 @@ def release_dict_file(): with open('/etc/lsb-release') as f: for line in f: key, value = line.split("=", 1) - data[key] = value + data[key] = value.strip() elif os.path.exists('/etc/redhat-release'): data = {} with open('/etc/redhat-release') as f: -- cgit v1.2.3-54-g00ecf