diff options
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index cd65e62030..5391c25af9 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -167,7 +167,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
167 | pass | 167 | pass |
168 | os.rename(self.image_rootfs, self.image_rootfs + '-dbg') | 168 | os.rename(self.image_rootfs, self.image_rootfs + '-dbg') |
169 | 169 | ||
170 | bb.note(" Restoreing original rootfs...") | 170 | bb.note(" Restoring original rootfs...") |
171 | os.rename(self.image_rootfs + '-orig', self.image_rootfs) | 171 | os.rename(self.image_rootfs + '-orig', self.image_rootfs) |
172 | 172 | ||
173 | def _exec_shell_cmd(self, cmd): | 173 | def _exec_shell_cmd(self, cmd): |
@@ -304,7 +304,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
304 | def _check_for_kernel_modules(self, modules_dir): | 304 | def _check_for_kernel_modules(self, modules_dir): |
305 | for root, dirs, files in os.walk(modules_dir, topdown=True): | 305 | for root, dirs, files in os.walk(modules_dir, topdown=True): |
306 | for name in files: | 306 | for name in files: |
307 | found_ko = name.endswith(".ko") | 307 | found_ko = name.endswith((".ko", ".ko.gz", ".ko.xz")) |
308 | if found_ko: | 308 | if found_ko: |
309 | return found_ko | 309 | return found_ko |
310 | return False | 310 | return False |
@@ -321,7 +321,9 @@ class Rootfs(object, metaclass=ABCMeta): | |||
321 | if not os.path.exists(kernel_abi_ver_file): | 321 | if not os.path.exists(kernel_abi_ver_file): |
322 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) | 322 | bb.fatal("No kernel-abiversion file found (%s), cannot run depmod, aborting" % kernel_abi_ver_file) |
323 | 323 | ||
324 | kernel_ver = open(kernel_abi_ver_file).read().strip(' \n') | 324 | with open(kernel_abi_ver_file) as f: |
325 | kernel_ver = f.read().strip(' \n') | ||
326 | |||
325 | versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) | 327 | versioned_modules_dir = os.path.join(self.image_rootfs, modules_dir, kernel_ver) |
326 | 328 | ||
327 | bb.utils.mkdirhier(versioned_modules_dir) | 329 | bb.utils.mkdirhier(versioned_modules_dir) |