diff options
| author |   Fredrik Gustafsson <fredrik.gustafsson@axis.com> | 2020-07-24 16:42:32 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-27 19:54:00 +0100 |
| commit | f8ee8bc737a982001b9fd0ad441495a52f12e9b4 (patch) | |
| tree | e67c976398b40e27224b400b3b2f22b7085647b0 | |
| parent | 405cd8560fed2e05fc82919d728c42516793cc0f (diff) | |
| download | openembedded-core-contrib-f8ee8bc737a982001b9fd0ad441495a52f12e9b4.tar.gz | |
deb: Move deb manifest to its own subdir
This is a part of a refactor that will split the package manager
code so that it's possible to use other package managers in other
layers.
Signed-off-by: Fredrik Gustafsson <fredrigu@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/manifest.py | 21 | ||||
| -rw-r--r-- | meta/lib/oe/package_manager/deb/__init__.py | 3 | ||||
| -rw-r--r-- | meta/lib/oe/package_manager/deb/manifest.py | 26 | ||||
| -rw-r--r-- | meta/lib/oe/rootfs.py | 1 |
4 files changed, 31 insertions, 20 deletions
diff --git a/meta/lib/oe/manifest.py b/meta/lib/oe/manifest.py index f87c150d33..47bd622412 100644 --- a/meta/lib/oe/manifest.py +++ b/meta/lib/oe/manifest.py @@ -187,32 +187,13 @@ class Manifest(object, metaclass=ABCMeta): return installed_pkgs -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_manager.rpm.manifest import RpmManifest from oe.package_manager.ipk.manifest import OpkgManifest + from oe.package_manager.deb.manifest import DpkgManifest manifest_map = {'rpm': RpmManifest, 'ipk': OpkgManifest, 'deb': DpkgManifest} diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py new file mode 100644 index 0000000000..a2094304c9 --- /dev/null +++ b/meta/lib/oe/package_manager/deb/__init__.py @@ -0,0 +1,3 @@ +# +# SPDX-License-Identifier: GPL-2.0-only +# diff --git a/meta/lib/oe/package_manager/deb/manifest.py b/meta/lib/oe/package_manager/deb/manifest.py new file mode 100644 index 0000000000..0b12036644 --- /dev/null +++ b/meta/lib/oe/package_manager/deb/manifest.py @@ -0,0 +1,26 @@ +# +# SPDX-License-Identifier: GPL-2.0-only +# + +from oe.manifest import Manifest + +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 1ba0a71253..876e13079c 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -13,6 +13,7 @@ import subprocess import re from oe.package_manager.rpm.manifest import RpmManifest from oe.package_manager.ipk.manifest import OpkgManifest +from oe.package_manager.deb.manifest import DpkgManifest class Rootfs(object, metaclass=ABCMeta): """ |