mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

package_manager.py: move target_rootfs property to common ancestor class

Browse Source 
This will be useful when also moving postinst_intercept handling to
package manager class from rootfs class.

(From OE-Core rev: a4cd69bdd5b9dfa1125887f4d9038d41996e39c7)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2018-04-03 18:45:18 +03:00
committed by Richard Purdie
parent f2a19a7fd1
commit b224c4e152
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/package_manager.py
+7 -9
View File
@@ -326,8 +326,9 @@ class PackageManager(object, metaclass=ABCMeta):
This is an abstract class. Do not instantiate this directly. This is an abstract class. Do not instantiate this directly.
""" """
def __init__(self, d): def __init__(self, d, target_rootfs):
self.d = d self.d = d
self.target_rootfs = target_rootfs
self.deploy_dir = None self.deploy_dir = None
self.deploy_lock = None self.deploy_lock = None
@@ -585,8 +586,7 @@ class RpmPM(PackageManager):
os_var=None, os_var=None,
rpm_repo_workdir="oe-rootfs-repo", rpm_repo_workdir="oe-rootfs-repo",
filterbydependencies=True): filterbydependencies=True):
super(RpmPM, self).__init__(d) super(RpmPM, self).__init__(d, target_rootfs)
self.target_rootfs = target_rootfs
self.target_vendor = target_vendor self.target_vendor = target_vendor
self.task_name = task_name self.task_name = task_name
if arch_var == None: if arch_var == None:
@@ -919,11 +919,11 @@ class RpmPM(PackageManager):
class OpkgDpkgPM(PackageManager): class OpkgDpkgPM(PackageManager):
def __init__(self, d): def __init__(self, d, target_rootfs):
""" """
This is an abstract class. Do not instantiate this directly. This is an abstract class. Do not instantiate this directly.
""" """
super(OpkgDpkgPM, self).__init__(d) super(OpkgDpkgPM, self).__init__(d, target_rootfs)
def package_info(self, pkg, cmd): def package_info(self, pkg, cmd):
""" """
@@ -988,9 +988,8 @@ class OpkgDpkgPM(PackageManager):
class OpkgPM(OpkgDpkgPM): class OpkgPM(OpkgDpkgPM):
def __init__(self, d, target_rootfs, config_file, archs, task_name='target'): def __init__(self, d, target_rootfs, config_file, archs, task_name='target'):
super(OpkgPM, self).__init__(d) super(OpkgPM, self).__init__(d, target_rootfs)
self.target_rootfs = target_rootfs
self.config_file = config_file self.config_file = config_file
self.pkg_archs = archs self.pkg_archs = archs
self.task_name = task_name self.task_name = task_name
@@ -1367,8 +1366,7 @@ class OpkgPM(OpkgDpkgPM):
class DpkgPM(OpkgDpkgPM): class DpkgPM(OpkgDpkgPM):
def __init__(self, d, target_rootfs, archs, base_archs, apt_conf_dir=None): def __init__(self, d, target_rootfs, archs, base_archs, apt_conf_dir=None):
super(DpkgPM, self).__init__(d) super(DpkgPM, self).__init__(d, target_rootfs)
self.target_rootfs = target_rootfs
self.deploy_dir = self.d.getVar('DEPLOY_DIR_DEB') self.deploy_dir = self.d.getVar('DEPLOY_DIR_DEB')
if apt_conf_dir is None: if apt_conf_dir is None:
self.apt_conf_dir = self.d.expand("${APTCONF_TARGET}/apt") self.apt_conf_dir = self.d.expand("${APTCONF_TARGET}/apt")