[PATCH 1/2] classes/base: add explicit bzip2-native dependency for unpacking .bz2

[PATCH 1/2] classes/base: add explicit bzip2-native dependency for unpacking .bz2

[Ross Burton]

Currently this is in ASSUME_PROVIDED and HOSTTOOLS so doesn't have any
effect, but declaring the dependency is the right thing to do.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes-global/base.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass
index 76fd0ac046a..ddf1d784a10 100644
--- a/meta/classes-global/base.bbclass
+++ b/meta/classes-global/base.bbclass
@@ -658,6 +658,10 @@ python () {
         elif uri.scheme == "repo":
             d.appendVarFlag('do_fetch', 'depends', ' repo-native:do_populate_sysroot')
 
+        # *.bz2 should DEPEND on bzip2-native for unpacking
+        if path.endswith('.bz2'):
+            d.appendVarFlag('do_unpack', 'depends', ' bzip2-native:do_populate_sysroot')
+
         # *.lz4 should DEPEND on lz4-native for unpacking
         if path.endswith('.lz4'):
             d.appendVarFlag('do_unpack', 'depends', ' lz4-native:do_populate_sysroot')
-- 
2.43.0

[PATCH 2/2] quilt: remove bzip2 RDEPENDS

[Ross Burton]

quilt has support for compressed patches but for some reason we only
listed bzip2 explicitly, despite it also supporting gzip/xz/lzma/lz/zst.

We don't have any recipes that use compressed patches and there's
nothing special about bzip2, so if a recipe does want to use compressed
patches then it can add the required dependency itself.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/quilt/quilt.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 387e132b602..202c2103fbc 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -86,8 +86,8 @@ FILES:guards = "${bindir}/guards"
 FILES:${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
 FILES:guards-doc = "${mandir}/man1/guards.1"
 
-RDEPENDS:${PN} = "bash patch diffstat bzip2 util-linux less"
-RDEPENDS:${PN}:class-native = "diffstat-native patch-native bzip2-native"
+RDEPENDS:${PN} = "bash patch diffstat util-linux less"
+RDEPENDS:${PN}:class-native = "diffstat-native patch-native"
 
 RDEPENDS:${PN}-ptest += "file sed gawk diffutils findutils ed perl \
                          perl-module-filehandle perl-module-getopt-std \
-- 
2.43.0