From: Hongxu Jia Date: Sun, 26 Jan 2014 10:14:17 +0000 (+0800) Subject: rootfs.py: strip kernel-abiversion useless readline X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34561 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17a0a8f44fe344ab1ae49730d9f17705b43987e5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git rootfs.py: strip kernel-abiversion useless readline It failed to read Kernel version from kernel-abiversion file, the reason was it didn't strip the readline. ... Error: Kernel version 3.10.25-yocto-standard does not match kernel-abiversion (3.10.25-yocto-standard) ... Signed-off-by: Hongxu Jia Signed-off-by: Laurentiu Palcu --- diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index e884e47733b..c149c942711 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -193,7 +193,7 @@ class Rootfs(object): kernel_abi_ver_file = os.path.join(self.d.getVar('STAGING_KERNEL_DIR', True), 'kernel-abiversion') if os.path.exists(kernel_abi_ver_file): - kernel_ver = open(kernel_abi_ver_file).read() + kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') modules_dir = os.path.join(self.image_rootfs, 'lib', 'modules', kernel_ver) bb.utils.mkdirhier(modules_dir)