diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-01-26 18:14:17 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:53:41 +0000 |
| commit | 3bc7a4f8143860200cd8be535ec1a5ff65607685 (patch) | |
| tree | cbd3041fb070d53f69139f23d8bfc14135235b16 | |
| parent | a49d9f8fc55e74491a34cf7f64d8d43cfc420c77 (diff) | |
| download | poky-3bc7a4f8143860200cd8be535ec1a5ff65607685.tar.gz | |
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)
...
(From OE-Core rev: 17a0a8f44fe344ab1ae49730d9f17705b43987e5)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index e884e47733..c149c94271 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
| @@ -193,7 +193,7 @@ class Rootfs(object): | |||
| 193 | kernel_abi_ver_file = os.path.join(self.d.getVar('STAGING_KERNEL_DIR', True), | 193 | kernel_abi_ver_file = os.path.join(self.d.getVar('STAGING_KERNEL_DIR', True), |
| 194 | 'kernel-abiversion') | 194 | 'kernel-abiversion') |
| 195 | if os.path.exists(kernel_abi_ver_file): | 195 | if os.path.exists(kernel_abi_ver_file): |
| 196 | kernel_ver = open(kernel_abi_ver_file).read() | 196 | kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') |
| 197 | modules_dir = os.path.join(self.image_rootfs, 'lib', 'modules', kernel_ver) | 197 | modules_dir = os.path.join(self.image_rootfs, 'lib', 'modules', kernel_ver) |
| 198 | 198 | ||
| 199 | bb.utils.mkdirhier(modules_dir) | 199 | bb.utils.mkdirhier(modules_dir) |