From: "seungkyun.kim" <[email protected]>
For multilib type packages, there is an additional temporary
installation before the actual installation. It makes almost doubles
the do_rootfs time if having many multilib type packages.
To avoid this overhead, run sanity test in parallel.
Installing package groups through opkg takes much more time than
copying directory.
- Changes in V2:
Fix FileNotFoundError exception when copying rootfs
- Changes in V3:
Removed unnecessary test call
Signed-off-by: seungkyun.kim <[email protected]>
---
meta/lib/oe/package_manager/ipk/rootfs.py | 36 +++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
b/meta/lib/oe/package_manager/ipk/rootfs.py
index ba93eb62ea..fa34dc56a2 100644
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -6,7 +6,9 @@
import re
import filecmp
+import multiprocessing
import shutil
+import stat
from oe.rootfs import Rootfs
from oe.manifest import Manifest
from oe.utils import execute_pre_post_process
@@ -197,11 +199,34 @@ class PkgRootfs(DpkgOpkgRootfs):
files[key] = item
def _multilib_test_install(self, pkgs):
+ def _copy_rootfs(src, dst):
+ if os.path.islink(src):
+ linkto = os.readlink(src)
+ if os.path.isabs(linkto):
+ linkto =
os.path.normpath(os.path.join(os.path.dirname(dst),
+
os.path.relpath(linkto, src)))
+ os.symlink(linkto, dst)
+ elif os.path.isfile(src):
+ shutil.copy2(src, dst)
+ elif stat.S_ISFIFO(os.stat(src).st_mode):
+ os.mkfifo(dst)
+ else:
+ bb.warn("Skip unsupported file type: %s" % src)
+
ml_temp = self.d.getVar("MULTILIB_TEMP_ROOTFS")
+ rootfs_temp = os.path.join(ml_temp, "rootfs")
bb.utils.mkdirhier(ml_temp)
+ bb.utils.remove(rootfs_temp, True)
- dirs = [self.image_rootfs]
+ if os.path.exists(self.image_rootfs):
+ shutil.copytree(self.image_rootfs, rootfs_temp,
copy_function=_copy_rootfs)
+ else:
+ bb.utils.mkdirhier(rootfs_temp)
+ dirs = [rootfs_temp]
+ return multiprocessing.Process(target=self._multilib_test_pkg_install,
+ args=(pkgs, ml_temp, dirs, False))
+ def _multilib_test_pkg_install(self, pkgs, ml_temp, dirs):
for variant in self.d.getVar("MULTILIB_VARIANTS").split():
ml_target_rootfs = os.path.join(ml_temp, variant)
@@ -218,6 +243,8 @@ class PkgRootfs(DpkgOpkgRootfs):
dirs.append(ml_target_rootfs)
self._multilib_sanity_test(dirs)
+ rootfs_temp = os.path.join(ml_temp, "rootfs")
+ bb.utils.remove(rootfs_temp)
'''
While ipk incremental image generation is enabled, it will remove the
@@ -300,15 +327,20 @@ class PkgRootfs(DpkgOpkgRootfs):
for pkg_type in self.install_order:
if pkg_type in pkgs_to_install:
+ sanity_test = None
# For multilib, we perform a sanity test before final install
# If sanity test fails, it will automatically do a bb.fatal()
# and the installation will stop
if pkg_type == Manifest.PKG_TYPE_MULTILIB:
- self._multilib_test_install(pkgs_to_install[pkg_type])
+ sanity_test=
self._multilib_test_install(pkgs_to_install[pkg_type])
+ sanity_test.start()
self.pm.install(pkgs_to_install[pkg_type],
[False, True][pkg_type ==
Manifest.PKG_TYPE_ATTEMPT_ONLY])
+ if sanity_test is not None:
+ sanity_test.join()
+
if self.progress_reporter:
self.progress_reporter.next_stage()
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199290):
https://lists.openembedded.org/g/openembedded-core/message/199290
Mute This Topic: https://lists.openembedded.org/mt/106114385/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
