Currently, the generate_index_files function only handles
the creation of index files in the DEPLOY_DIR_<PKG_TYPE>
directories. This change adds an optional feedname input
that will instead point the index generation at a package
specific feed directory. If no feedname is specified,
the original behavior persists.
The directory for index creation will be
${DEPLOY_DIR_FEED_<PKG_TYPE>}/feedname.
Signed-off-by: Charlie Johnston <charlie.johns...@ni.com>
---
meta/lib/oe/package_manager/__init__.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oe/package_manager/__init__.py
b/meta/lib/oe/package_manager/__init__.py
index 0c313190cf..0934cda89d 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -533,7 +533,7 @@ def create_packages_dir(d, subrepo_dir, deploydir,
taskname, filterbydependencie
raise
-def generate_index_files(d):
+def generate_index_files(d, feedname = None):
from oe.package_manager.rpm import RpmSubdirIndexer
from oe.package_manager.ipk import OpkgIndexer
from oe.package_manager.deb import DpkgIndexer
@@ -541,9 +541,9 @@ def generate_index_files(d):
classes = d.getVar('PACKAGE_CLASSES').replace("package_", "").split()
indexer_map = {
- "rpm": (RpmSubdirIndexer, d.getVar('DEPLOY_DIR_RPM')),
- "ipk": (OpkgIndexer, d.getVar('DEPLOY_DIR_IPK')),
- "deb": (DpkgIndexer, d.getVar('DEPLOY_DIR_DEB'))
+ "rpm": (RpmSubdirIndexer, d.getVar('DEPLOY_DIR_RPM'),
d.expand('${DEPLOY_DIR_FEED_RPM}/%s' % feedname)),
+ "ipk": (OpkgIndexer, d.getVar('DEPLOY_DIR_IPK'),
d.expand('${DEPLOY_DIR_FEED_IPK}/%s' % feedname)),
+ "deb": (DpkgIndexer, d.getVar('DEPLOY_DIR_DEB'),
d.expand('${DEPLOY_DIR_FEED_DEB}/%s' % feedname))
}
result = None
@@ -552,8 +552,9 @@ def generate_index_files(d):
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()
+ feedpath = indexer_map[pkg_class][1] if feedname is None else
indexer_map[pkg_class][2]
+ if os.path.exists(feedpath):
+ result = indexer_map[pkg_class][0](d, feedpath).write_index()
if result is not None:
bb.fatal(result)
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#185176):
https://lists.openembedded.org/g/openembedded-core/message/185176
Mute This Topic: https://lists.openembedded.org/mt/100471803/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
