[oe-commits] Hongxu Jia : rootfs.py: strip kernel-abiversion useless readline

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 17a0a8f44fe344ab1ae49730d9f17705b43987e5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=17a0a8f44fe344ab1ae49730d9f17705b43987e5

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Sun Jan 26 18:14:17 2014 +0800

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 <hongxu.jia at windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>

---

 meta/lib/oe/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index e884e47..c149c94 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)