Skip to contentSkip to conversation

lib/oe: Split package manager code to multiple files

PATCH New [email protected] 1 participant 1 message Jun 23, 2020 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 2/2 lib/oe: Split package manager code to multiple files

Today OE-Core has support for three package managers, even if there are many more package managers that could be interesting to use. Adding a new package manager to OE-Core would increase the test matrix significantly. In order to let users use their favorite package manager without need for it to have support from upstream, this patch refactors the package manager code so that it's easy to add a new package manager in another layer.

This patch is mostly moving code and duplicating some code (because of the hard coupling between deb and ipk).

---
 meta/classes/populate_sdk_base.bbclass        |   11 +-
 meta/lib/oe/manifest.py                       |  149 +-
 meta/lib/oe/package_manager.py                | 1402 +----------------
 meta/lib/oe/package_managers/deb/manifest.py  |   31 +
 .../package_managers/deb/package_manager.py   |  719 +++++++++
 meta/lib/oe/package_managers/deb/rootfs.py    |  213 +++
 meta/lib/oe/package_managers/deb/sdk.py       |   97 ++
 .../ipk/.package_manager.py.swo               |  Bin 0 -> 45056 bytes
 meta/lib/oe/package_managers/ipk/manifest.py  |   79 +
 .../package_managers/ipk/package_manager.py   |  588 +++++++
 meta/lib/oe/package_managers/ipk/rootfs.py    |  395 +++++
 meta/lib/oe/package_managers/ipk/sdk.py       |  104 ++
 meta/lib/oe/package_managers/rpm/manifest.py  |   62 +
 .../package_managers/rpm/package_manager.py   |  423 +++++
 meta/lib/oe/package_managers/rpm/rootfs.py    |  154 ++
 meta/lib/oe/package_managers/rpm/sdk.py       |  104 ++
 meta/lib/oe/rootfs.py                         |  631 +-------
 meta/lib/oe/sdk.py                            |  311 +---
 meta/lib/oeqa/utils/package_manager.py        |   29 +-
 meta/recipes-core/meta/package-index.bb       |    2 +-
 20 files changed, 3014 insertions(+), 2490 deletions(-)
 create mode 100644 meta/lib/oe/package_managers/deb/manifest.py
 create mode 100644 meta/lib/oe/package_managers/deb/package_manager.py
 create mode 100644 meta/lib/oe/package_managers/deb/rootfs.py
 create mode 100644 meta/lib/oe/package_managers/deb/sdk.py
 create mode 100644 meta/lib/oe/package_managers/ipk/.package_manager.py.swo
 create mode 100644 meta/lib/oe/package_managers/ipk/manifest.py
 create mode 100644 meta/lib/oe/package_managers/ipk/package_manager.py
 create mode 100644 meta/lib/oe/package_managers/ipk/rootfs.py
 create mode 100644 meta/lib/oe/package_managers/ipk/sdk.py
 create mode 100644 meta/lib/oe/package_managers/rpm/manifest.py
 create mode 100644 meta/lib/oe/package_managers/rpm/package_manager.py
 create mode 100644 meta/lib/oe/package_managers/rpm/rootfs.py
 create mode 100644 meta/lib/oe/package_managers/rpm/sdk.py
meta/classes/populate_sdk_base.bbclass +10 -1
index 990505e89b..d31cda4714 100644
@@ -330,9 +330,18 @@ do_populate_sdk[vardeps] += "${@sdk_variables(d)}"
 do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \
                                     ${TOOLCHAIN_SHAR_EXT_TMPL}:True"
 
+def get_package_write_tasks(d):
+    package_managers = d.getVar('PACKAGE_CLASSES').split()
+    tasks = ''
+    for package_manager in package_managers:
+        package_manager = package_manager.replace('package_', '')
+        tasks += ' do_package_write_' + package_manager
+    return tasks
+
 do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
 do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])}  ${@d.getVarFlag('do_rootfs', 'depends', False)}"
 do_populate_sdk[rdepends] = "${@' '.join([x + ':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in d.getVar('SDK_RDEPENDS').split()])}"
-do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"
+do_populate_sdk[recrdeptask] += "do_packagedata "
+do_populate_sdk[recrdeptask] += "${@get_package_write_tasks(d)}"
 do_populate_sdk[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
 addtask populate_sdk
meta/lib/oe/manifest.py +2 -147

157 lines not on this page · raw message

meta/lib/oe/package_manager.py +4 -1398

1,424 lines not on this page · raw message

meta/lib/oe/package_managers/deb/manifest.py new file +31 -0
new file mode 100644
index 0000000000..077db13f1c
@@ -0,0 +1,31 @@
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+from abc import ABCMeta, abstractmethod
+import os
+import re
+import bb
+from oe.manifest import *
+
+class PkgManifest(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
+
meta/lib/oe/package_managers/deb/package_manager.py new file +719 -0

719 lines not on this page · raw message

meta/lib/oe/package_managers/deb/rootfs.py new file +213 -0

213 lines not on this page · raw message

meta/lib/oe/package_managers/deb/sdk.py new file +97 -0

97 lines not on this page · raw message

meta/lib/oe/package_managers/ipk/.package_manager.py.swo new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..e75431e2caaac37152ef454e776d8a9d53ead35e
GIT binary patch
meta/lib/oe/package_managers/ipk/manifest.py new file +79 -0

79 lines not on this page · raw message

meta/lib/oe/package_managers/ipk/package_manager.py new file +588 -0

261 lines not on this page · raw message

meta/lib/oe/package_managers/ipk/rootfs.py new file +395 -0

395 lines not on this page · raw message

meta/lib/oe/package_managers/ipk/sdk.py new file +104 -0

104 lines not on this page · raw message

meta/lib/oe/package_managers/rpm/manifest.py new file +62 -0

62 lines not on this page · raw message

meta/lib/oe/package_managers/rpm/package_manager.py new file +423 -0

423 lines not on this page · raw message

meta/lib/oe/package_managers/rpm/rootfs.py new file +154 -0

154 lines not on this page · raw message

meta/lib/oe/package_managers/rpm/sdk.py new file +104 -0

104 lines not on this page · raw message

meta/lib/oe/rootfs.py +9 -622

631 lines not on this page · raw message

meta/lib/oe/sdk.py +15 -296

311 lines not on this page · raw message

meta/lib/oeqa/utils/package_manager.py +4 -25
index 2d358f7172..8e31d148c7 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/meta/package-index.bb +1 -1
index 98c5bcb372..4b063f4298 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.20.1

Part of the diff is not shown here. View the raw message.