Let the manifest only used by the dpkg package manager live in the dpkg
directory.
Signed-off-by: Fredrik Gustafsson <fredr...@axis.com>
---
meta/lib/oe/manifest.py | 23 +----------------
meta/lib/oe/package_managers/deb/manifest.py | 27 ++++++++++++++++++++
meta/lib/oe/rootfs.py | 1 +
meta/lib/oe/sdk.py | 1 +
4 files changed, 30 insertions(+), 22 deletions(-)
create mode 100644 meta/lib/oe/package_managers/deb/manifest.py
diff --git a/meta/lib/oe/manifest.py b/meta/lib/oe/manifest.py
index cf2cbe22eb..db71766bb6 100644
--- a/meta/lib/oe/manifest.py
+++ b/meta/lib/oe/manifest.py
@@ -258,31 +258,10 @@ class OpkgManifest(Manifest):
return
-class DpkgManifest(Manifest):
- def create_initial(self):
- with open(self.initial_manifest, "w+") as manifest:
- manifest.write(self.initial_manifest_file_header)
-
- for var in self.var_maps[self.manifest_type]:
- pkg_list = self.d.getVar(var)
-
- if pkg_list is None:
- continue
-
- for pkg in pkg_list.split():
- manifest.write("%s,%s\n" %
- (self.var_maps[self.manifest_type][var],
pkg))
-
- def create_final(self):
- pass
-
- def create_full(self, pm):
- pass
-
-
def create_manifest(d, final_manifest=False, manifest_dir=None,
manifest_type=Manifest.MANIFEST_TYPE_IMAGE):
from oe.package_managers.rpm.manifest import RpmManifest
+ from oe.package_managers.deb.manifest import DpkgManifest
manifest_map = {'rpm': RpmManifest,
'ipk': OpkgManifest,
'deb': DpkgManifest}
diff --git a/meta/lib/oe/package_managers/deb/manifest.py
b/meta/lib/oe/package_managers/deb/manifest.py
new file mode 100644
index 0000000000..9b186555dc
--- /dev/null
+++ b/meta/lib/oe/package_managers/deb/manifest.py
@@ -0,0 +1,27 @@
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+from oe.manifest import *
+
+class DpkgManifest(Manifest):
+ def create_initial(self):
+ with open(self.initial_manifest, "w+") as manifest:
+ manifest.write(self.initial_manifest_file_header)
+
+ for var in self.var_maps[self.manifest_type]:
+ pkg_list = self.d.getVar(var)
+
+ if pkg_list is None:
+ continue
+
+ for pkg in pkg_list.split():
+ manifest.write("%s,%s\n" %
+ (self.var_maps[self.manifest_type][var],
pkg))
+
+ def create_final(self):
+ pass
+
+ def create_full(self, pm):
+ pass
+
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index e920f944c4..7ff9b4e171 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -614,6 +614,7 @@ class DpkgRootfs(DpkgOpkgRootfs):
bb.utils.remove(self.image_rootfs, True)
bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True)
+ from oe.package_managers.deb.manifest import DpkgManifest
self.manifest = DpkgManifest(d, manifest_dir)
self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS'),
d.getVar('PACKAGE_ARCHS'),
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index d543a2a92d..2ee46fe9cc 100644
--- a/meta/lib/oe/sdk.py
+++ b/meta/lib/oe/sdk.py
@@ -309,6 +309,7 @@ class DpkgSdk(Sdk):
self.target_conf_dir = os.path.join(self.d.getVar("APTCONF_TARGET"),
"apt")
self.host_conf_dir = os.path.join(self.d.getVar("APTCONF_TARGET"),
"apt-sdk")
+ from oe.package_managers.deb.manifest import DpkgManifest
self.target_manifest = DpkgManifest(d, self.manifest_dir,
Manifest.MANIFEST_TYPE_SDK_TARGET)
self.host_manifest = DpkgManifest(d, self.manifest_dir,
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139911):
https://lists.openembedded.org/g/openembedded-core/message/139911
Mute This Topic: https://lists.openembedded.org/mt/75099993/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
