From 66adbbce87cd725f7dde0f947808c7a390a4bbf8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 6 Apr 2021 16:26:16 +0200 Subject: libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge * with usrmerge ${base_bindir} is /usr/bin/sh and libsmi fails with: ERROR: libsmi-0.5.0-r0 do_package_qa: QA Issue: /usr/bin/smistrip contained in package libsmi requires /usr/bin/sh, but no providers found in RDEPENDS_libsmi? [file-rdeps] ERROR: libsmi-0.5.0-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. * this is a bit strange as busybox does install /usr/bin/sh file: ./1.33.0-r0.usrmerge/image/usr/bin/sh ./1.33.0-r0.default/image/bin/sh but also adds /bin/sh to RPROVIDES_${PN} for usrmerge in DISTRO_FEATURES: RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh', '', d)}" added in: https://git.openembedded.org/openembedded-core/commit/?id=1f6c14939c8daa5e09103789c3ff5031cc888d16 and 1.33.0-r0.usrmerge/pkgdata/runtime/busybox:FILERPROVIDES_/usr/bin/busybox.nosuid_busybox correctly contains /usr/bin/sh * adding runtime dependency on busybox as /usr/bin/sh provider would silence the QA warning but people might not like adding busybox to their image * using /bin/sh silences the QA warning as well, because /bin/sh is explicitly ignored in file-rdeps insane.bbclass: https://git.openembedded.org/openembedded-core/tree/meta/classes/insane.bbclass?id=1f6c14939c8daa5e09103789c3ff5031cc888d16#n907 if "file-rdeps" not in skip: ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)']) Signed-off-by: Martin Jansa Signed-off-by: Khem Raj (cherry picked from commit 08fad9f3a6d1026eea84906c2ede7a4a2dc93863) Signed-off-by: Armin Kuster --- meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 212b1e797c..ae76fade73 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -16,7 +16,7 @@ RDEPENDS_${PN} += "wget" inherit autotools -EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" +EXTRA_OECONF = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" do_install_append () { install -d ${D}${sysconfdir} -- cgit 1.2.3-korg