diff options
Diffstat (limited to 'meta/lib/oe/package_manager/deb')
-rw-r--r-- | meta/lib/oe/package_manager/deb/__init__.py | 4 | ||||
-rw-r--r-- | meta/lib/oe/package_manager/deb/manifest.py | 2 | ||||
-rw-r--r-- | meta/lib/oe/package_manager/deb/rootfs.py | 8 | ||||
-rw-r--r-- | meta/lib/oe/package_manager/deb/sdk.py | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py index 5120920e70..10ad707c23 100644 --- a/meta/lib/oe/package_manager/deb/__init__.py +++ b/meta/lib/oe/package_manager/deb/__init__.py | |||
@@ -79,7 +79,7 @@ class DpkgIndexer(Indexer): | |||
79 | if self.d.getVar('PACKAGE_FEED_SIGN') == '1': | 79 | if self.d.getVar('PACKAGE_FEED_SIGN') == '1': |
80 | raise NotImplementedError('Package feed signing not implementd for dpkg') | 80 | raise NotImplementedError('Package feed signing not implementd for dpkg') |
81 | 81 | ||
82 | class DpkgPkgsList(PkgsList): | 82 | class PMPkgsList(PkgsList): |
83 | 83 | ||
84 | def list_pkgs(self): | 84 | def list_pkgs(self): |
85 | cmd = [bb.utils.which(os.getenv('PATH'), "dpkg-query"), | 85 | cmd = [bb.utils.which(os.getenv('PATH'), "dpkg-query"), |
@@ -461,7 +461,7 @@ class DpkgPM(OpkgDpkgPM): | |||
461 | "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) | 461 | "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) |
462 | 462 | ||
463 | def list_installed(self): | 463 | def list_installed(self): |
464 | return DpkgPkgsList(self.d, self.target_rootfs).list_pkgs() | 464 | return PMPkgsList(self.d, self.target_rootfs).list_pkgs() |
465 | 465 | ||
466 | def package_info(self, pkg): | 466 | def package_info(self, pkg): |
467 | """ | 467 | """ |
diff --git a/meta/lib/oe/package_manager/deb/manifest.py b/meta/lib/oe/package_manager/deb/manifest.py index 0b12036644..d8eab24a06 100644 --- a/meta/lib/oe/package_manager/deb/manifest.py +++ b/meta/lib/oe/package_manager/deb/manifest.py | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | from oe.manifest import Manifest | 5 | from oe.manifest import Manifest |
6 | 6 | ||
7 | class DpkgManifest(Manifest): | 7 | class PkgManifest(Manifest): |
8 | def create_initial(self): | 8 | def create_initial(self): |
9 | with open(self.initial_manifest, "w+") as manifest: | 9 | with open(self.initial_manifest, "w+") as manifest: |
10 | manifest.write(self.initial_manifest_file_header) | 10 | manifest.write(self.initial_manifest_file_header) |
diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py index 819f67eda5..8fbaca11d6 100644 --- a/meta/lib/oe/package_manager/deb/rootfs.py +++ b/meta/lib/oe/package_manager/deb/rootfs.py | |||
@@ -7,7 +7,7 @@ import shutil | |||
7 | from oe.rootfs import Rootfs | 7 | from oe.rootfs import Rootfs |
8 | from oe.manifest import Manifest | 8 | from oe.manifest import Manifest |
9 | from oe.utils import execute_pre_post_process | 9 | from oe.utils import execute_pre_post_process |
10 | from oe.package_manager.deb.manifest import DpkgManifest | 10 | from oe.package_manager.deb.manifest import PkgManifest |
11 | from oe.package_manager.deb import DpkgPM | 11 | from oe.package_manager.deb import DpkgPM |
12 | 12 | ||
13 | class DpkgOpkgRootfs(Rootfs): | 13 | class DpkgOpkgRootfs(Rootfs): |
@@ -120,9 +120,9 @@ class DpkgOpkgRootfs(Rootfs): | |||
120 | 120 | ||
121 | num += 1 | 121 | num += 1 |
122 | 122 | ||
123 | class DpkgRootfs(DpkgOpkgRootfs): | 123 | class PkgRootfs(DpkgOpkgRootfs): |
124 | def __init__(self, d, manifest_dir, progress_reporter=None, logcatcher=None): | 124 | def __init__(self, d, manifest_dir, progress_reporter=None, logcatcher=None): |
125 | super(DpkgRootfs, self).__init__(d, progress_reporter, logcatcher) | 125 | super(PkgRootfs, self).__init__(d, progress_reporter, logcatcher) |
126 | self.log_check_regex = '^E:' | 126 | self.log_check_regex = '^E:' |
127 | self.log_check_expected_regexes = \ | 127 | self.log_check_expected_regexes = \ |
128 | [ | 128 | [ |
@@ -131,7 +131,7 @@ class DpkgRootfs(DpkgOpkgRootfs): | |||
131 | 131 | ||
132 | bb.utils.remove(self.image_rootfs, True) | 132 | bb.utils.remove(self.image_rootfs, True) |
133 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True) | 133 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True) |
134 | self.manifest = DpkgManifest(d, manifest_dir) | 134 | self.manifest = PkgManifest(d, manifest_dir) |
135 | self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS'), | 135 | self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS'), |
136 | d.getVar('PACKAGE_ARCHS'), | 136 | d.getVar('PACKAGE_ARCHS'), |
137 | d.getVar('DPKG_ARCH')) | 137 | d.getVar('DPKG_ARCH')) |
diff --git a/meta/lib/oe/package_manager/deb/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py index b25eb70b00..9859d8f32d 100644 --- a/meta/lib/oe/package_manager/deb/sdk.py +++ b/meta/lib/oe/package_manager/deb/sdk.py | |||
@@ -8,19 +8,19 @@ from oe.utils import execute_pre_post_process | |||
8 | from oe.sdk import Sdk | 8 | from oe.sdk import Sdk |
9 | from oe.manifest import Manifest | 9 | from oe.manifest import Manifest |
10 | from oe.package_manager.deb import DpkgPM | 10 | from oe.package_manager.deb import DpkgPM |
11 | from oe.package_manager.deb.manifest import PkgManifest | ||
11 | 12 | ||
12 | class DpkgSdk(Sdk): | 13 | class PkgSdk(Sdk): |
13 | def __init__(self, d, manifest_dir=None): | 14 | def __init__(self, d, manifest_dir=None): |
14 | super(DpkgSdk, self).__init__(d, manifest_dir) | 15 | super(PkgSdk, self).__init__(d, manifest_dir) |
15 | 16 | ||
16 | self.target_conf_dir = os.path.join(self.d.getVar("APTCONF_TARGET"), "apt") | 17 | self.target_conf_dir = os.path.join(self.d.getVar("APTCONF_TARGET"), "apt") |
17 | self.host_conf_dir = os.path.join(self.d.getVar("APTCONF_TARGET"), "apt-sdk") | 18 | self.host_conf_dir = os.path.join(self.d.getVar("APTCONF_TARGET"), "apt-sdk") |
18 | 19 | ||
19 | from oe.package_manager.deb.manifest import DpkgManifest | ||
20 | 20 | ||
21 | self.target_manifest = DpkgManifest(d, self.manifest_dir, | 21 | self.target_manifest = PkgManifest(d, self.manifest_dir, |
22 | Manifest.MANIFEST_TYPE_SDK_TARGET) | 22 | Manifest.MANIFEST_TYPE_SDK_TARGET) |
23 | self.host_manifest = DpkgManifest(d, self.manifest_dir, | 23 | self.host_manifest = PkgManifest(d, self.manifest_dir, |
24 | Manifest.MANIFEST_TYPE_SDK_HOST) | 24 | Manifest.MANIFEST_TYPE_SDK_HOST) |
25 | 25 | ||
26 | deb_repo_workdir = "oe-sdk-repo" | 26 | deb_repo_workdir = "oe-sdk-repo" |