Currently, filterbydependencies is always set with True, which results in
the creation of `oe-rootfs-repo`. If filterbydependencies is not set,
it creates `oe-rootfs-repo` as a symlink to the "DEPLOY_DIR_<IPK/RPM/DEB>"
directory. With this patch, users can configure this behavior according
to their use cases using the variable `DISABLE_FILTER_BY_DEPENDENCY`.
Signed-off-by: Sreejith Ravi <sreejith.ravi...@gmail.com>
---
meta/conf/bitbake.conf | 3 +++
meta/lib/oe/package_manager/__init__.py | 1 +
meta/lib/oe/package_manager/deb/rootfs.py | 4 +++-
meta/lib/oe/package_manager/ipk/rootfs.py | 7 +++++--
meta/lib/oe/package_manager/rpm/rootfs.py | 4 +++-
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index eda505c861..1b3ef40782 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -992,3 +992,6 @@ oe.path.format_display[vardepsexclude] = "TOPDIR"
oe.utils.get_bb_number_threads[vardepsexclude] = "BB_NUMBER_THREADS"
oe.packagedata.emit_pkgdata[vardepsexclude] = "BB_NUMBER_THREADS"
oe.packagedata.read_subpkgdata_extended[vardepsexclude] = "BB_NUMBER_THREADS"
+
+# To configure the filterbydependencies feature for rootfs generation to set
the feeds.
+DISABLE_FILTER_BY_DEPENDENCY ?= "0"
diff --git a/meta/lib/oe/package_manager/__init__.py
b/meta/lib/oe/package_manager/__init__.py
index 2100a97c12..806bebfae4 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -467,6 +467,7 @@ def create_packages_dir(d, subrepo_dir, deploydir,
taskname, filterbydependencie
# Detect bitbake -b usage
nodeps = d.getVar("BB_LIMITEDDEPS") or False
+ bb.note("filterbydependencies %s" %filterbydependencies)
if nodeps or not filterbydependencies:
for arch in d.getVar("ALL_MULTILIB_PACKAGE_ARCHS").split() +
d.getVar("ALL_MULTILIB_PACKAGE_ARCHS").replace("-", "_").split():
target = os.path.join(deploydir + "/" + arch)
diff --git a/meta/lib/oe/package_manager/deb/rootfs.py
b/meta/lib/oe/package_manager/deb/rootfs.py
index 1e25b64ed9..04fd55c485 100644
--- a/meta/lib/oe/package_manager/deb/rootfs.py
+++ b/meta/lib/oe/package_manager/deb/rootfs.py
@@ -134,9 +134,11 @@ class PkgRootfs(DpkgOpkgRootfs):
bb.utils.remove(self.image_rootfs, True)
bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True)
self.manifest = PkgManifest(d, manifest_dir)
+ filter_deps = False if d.getVar("DISABLE_FILTER_BY_DEPENDENCY") == "1"
else True
self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS'),
d.getVar('PACKAGE_ARCHS'),
- d.getVar('DPKG_ARCH'))
+ d.getVar('DPKG_ARCH'),
+ filterbydependencies=filter_deps)
def _create(self):
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py
b/meta/lib/oe/package_manager/ipk/rootfs.py
index ba93eb62ea..52d0785ef9 100644
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -131,6 +131,7 @@ class PkgRootfs(DpkgOpkgRootfs):
self.manifest = PkgManifest(d, manifest_dir)
self.opkg_conf = self.d.getVar("IPKGCONF_TARGET")
self.pkg_archs = self.d.getVar("ALL_MULTILIB_PACKAGE_ARCHS")
+ filter_deps = False if d.getVar("DISABLE_FILTER_BY_DEPENDENCY") == "1"
else True
self.inc_opkg_image_gen = self.d.getVar('INC_IPK_IMAGE_GEN') or ""
if self._remove_old_rootfs():
@@ -138,12 +139,14 @@ class PkgRootfs(DpkgOpkgRootfs):
self.pm = OpkgPM(d,
self.image_rootfs,
self.opkg_conf,
- self.pkg_archs)
+ self.pkg_archs,
+ filterbydependencies=filter_deps)
else:
self.pm = OpkgPM(d,
self.image_rootfs,
self.opkg_conf,
- self.pkg_archs)
+ self.pkg_archs,
+ filterbydependencies=filter_deps)
self.pm.recover_packaging_data()
bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS'), True)
diff --git a/meta/lib/oe/package_manager/rpm/rootfs.py
b/meta/lib/oe/package_manager/rpm/rootfs.py
index 3ba5396320..361a77ca7f 100644
--- a/meta/lib/oe/package_manager/rpm/rootfs.py
+++ b/meta/lib/oe/package_manager/rpm/rootfs.py
@@ -16,12 +16,14 @@ class PkgRootfs(Rootfs):
self.log_check_regex = r'(unpacking of archive failed|Cannot find
package'\
r'|exit 1|ERROR: |Error: |Error |ERROR '\
r'|Failed |Failed: |Failed$|Failed\(\d+\):)'
+ filter_deps = False if d.getVar("DISABLE_FILTER_BY_DEPENDENCY") == "1"
else True
self.manifest = PkgManifest(d, manifest_dir)
self.pm = RpmPM(d,
d.getVar('IMAGE_ROOTFS'),
- self.d.getVar('TARGET_VENDOR')
+ self.d.getVar('TARGET_VENDOR'),
+ filterbydependencies=filter_deps
)
self.inc_rpm_image_gen = self.d.getVar('INC_RPM_IMAGE_GEN')
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206354):
https://lists.openembedded.org/g/openembedded-core/message/206354
Mute This Topic: https://lists.openembedded.org/mt/109210754/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
