From 0521d48a1612bfc735e2c86acc9b685c1dc389ef Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 25 Feb 2014 14:36:17 +0200 Subject: package_manager.py: create index files for all backends in PACKAGE_CLASSES The previous implementation was checking IMAGE_PKGTYPE and created the index files just for the backend used to create the image. Apparently, 'bitbake package-index' should attempt to create the index files for all backends specified in PACKAGE_CLASSES. [YOCTO #5827] Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index d29adaca7b..ff4f1dee03 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1519,19 +1519,25 @@ class DpkgPM(PackageManager): def generate_index_files(d): - img_type = d.getVar('IMAGE_PKGTYPE', True) + classes = d.getVar('PACKAGE_CLASSES', True).replace("package_", "").split() + + indexer_map = { + "rpm": (RpmIndexer, d.getVar('DEPLOY_DIR_RPM', True)), + "ipk": (OpkgIndexer, d.getVar('DEPLOY_DIR_IPK', True)), + "deb": (DpkgIndexer, d.getVar('DEPLOY_DIR_DEB', True)) + } result = None - if img_type == "rpm": - result = RpmIndexer(d, d.getVar('DEPLOY_DIR_RPM', True)).write_index() - elif img_type == "ipk": - result = OpkgIndexer(d, d.getVar('DEPLOY_DIR_IPK', True)).write_index() - elif img_type == "deb": - result = DpkgIndexer(d, d.getVar('DEPLOY_DIR_DEB', True)).write_index() + for pkg_class in classes: + if not pkg_class in indexer_map: + continue + + if os.path.exists(indexer_map[pkg_class][1]): + result = indexer_map[pkg_class][0](d, indexer_map[pkg_class][1]).write_index() - if result is not None: - bb.fatal(result) + if result is not None: + bb.fatal(result) if __name__ == "__main__": """ -- cgit 1.2.3-korg