diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 15:18:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-15 09:44:33 +0100 |
commit | 26a786f86989ce47eac4eecec3b0798730194b05 (patch) | |
tree | 263638168e588d8c06f476d9d238e261c13fc294 /meta/lib/oe/package_manager.py | |
parent | ad6b73702934c0bb10afe66e13936d1313782352 (diff) | |
download | poky-26a786f86989ce47eac4eecec3b0798730194b05.tar.gz |
package_manager/sdk: Use filtered copies of the deploy ipk/deb directories
Similar to rpm, use copies of the ipk/deb directories for rootfs construction.
This means the image creation code can no longer "see" recipes wich aren't in its
dependency chain which is good for a variety of reasons including determinism,
incompatible recipe (e.g. systemd/sysvinit) package conflicts and locking
performance.
(From OE-Core rev: c7c5f4065c102fde4e11d138fb0b6e25bffe0379)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r-- | meta/lib/oe/package_manager.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f1dbe48a72..06d1f09d9f 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -1124,19 +1124,22 @@ class OpkgDpkgPM(PackageManager): | |||
1124 | self.mark_packages("unpacked", registered_pkgs.split()) | 1124 | self.mark_packages("unpacked", registered_pkgs.split()) |
1125 | 1125 | ||
1126 | class OpkgPM(OpkgDpkgPM): | 1126 | class OpkgPM(OpkgDpkgPM): |
1127 | def __init__(self, d, target_rootfs, config_file, archs, task_name='target'): | 1127 | def __init__(self, d, target_rootfs, config_file, archs, task_name='target', ipk_repo_workdir="oe-rootfs-repo", filterbydependencies=True, prepare_index=True): |
1128 | super(OpkgPM, self).__init__(d, target_rootfs) | 1128 | super(OpkgPM, self).__init__(d, target_rootfs) |
1129 | 1129 | ||
1130 | self.config_file = config_file | 1130 | self.config_file = config_file |
1131 | self.pkg_archs = archs | 1131 | self.pkg_archs = archs |
1132 | self.task_name = task_name | 1132 | self.task_name = task_name |
1133 | 1133 | ||
1134 | self.deploy_dir = self.d.getVar("DEPLOY_DIR_IPK") | 1134 | self.deploy_dir = oe.path.join(self.d.getVar('WORKDIR'), ipk_repo_workdir) |
1135 | self.deploy_lock_file = os.path.join(self.deploy_dir, "deploy.lock") | 1135 | self.deploy_lock_file = os.path.join(self.deploy_dir, "deploy.lock") |
1136 | self.opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg") | 1136 | self.opkg_cmd = bb.utils.which(os.getenv('PATH'), "opkg") |
1137 | self.opkg_args = "--volatile-cache -f %s -t %s -o %s " % (self.config_file, self.d.expand('${T}/ipktemp/') ,target_rootfs) | 1137 | self.opkg_args = "--volatile-cache -f %s -t %s -o %s " % (self.config_file, self.d.expand('${T}/ipktemp/') ,target_rootfs) |
1138 | self.opkg_args += self.d.getVar("OPKG_ARGS") | 1138 | self.opkg_args += self.d.getVar("OPKG_ARGS") |
1139 | 1139 | ||
1140 | if prepare_index: | ||
1141 | create_packages_dir(self.d, self.deploy_dir, d.getVar("DEPLOY_DIR_IPK"), "package_write_ipk", filterbydependencies) | ||
1142 | |||
1140 | opkg_lib_dir = self.d.getVar('OPKGLIBDIR') | 1143 | opkg_lib_dir = self.d.getVar('OPKGLIBDIR') |
1141 | if opkg_lib_dir[0] == "/": | 1144 | if opkg_lib_dir[0] == "/": |
1142 | opkg_lib_dir = opkg_lib_dir[1:] | 1145 | opkg_lib_dir = opkg_lib_dir[1:] |
@@ -1501,9 +1504,12 @@ class OpkgPM(OpkgDpkgPM): | |||
1501 | return tmp_dir | 1504 | return tmp_dir |
1502 | 1505 | ||
1503 | class DpkgPM(OpkgDpkgPM): | 1506 | class DpkgPM(OpkgDpkgPM): |
1504 | def __init__(self, d, target_rootfs, archs, base_archs, apt_conf_dir=None): | 1507 | def __init__(self, d, target_rootfs, archs, base_archs, apt_conf_dir=None, deb_repo_workdir="oe-rootfs-repo", filterbydependencies=True): |
1505 | super(DpkgPM, self).__init__(d, target_rootfs) | 1508 | super(DpkgPM, self).__init__(d, target_rootfs) |
1506 | self.deploy_dir = self.d.getVar('DEPLOY_DIR_DEB') | 1509 | self.deploy_dir = oe.path.join(self.d.getVar('WORKDIR'), deb_repo_workdir) |
1510 | |||
1511 | create_packages_dir(self.d, self.deploy_dir, d.getVar("DEPLOY_DIR_DEB"), "package_write_deb", filterbydependencies) | ||
1512 | |||
1507 | if apt_conf_dir is None: | 1513 | if apt_conf_dir is None: |
1508 | self.apt_conf_dir = self.d.expand("${APTCONF_TARGET}/apt") | 1514 | self.apt_conf_dir = self.d.expand("${APTCONF_TARGET}/apt") |
1509 | else: | 1515 | else: |