From a69eee72b25411880146821fe4ec07be4704afee Mon Sep 17 00:00:00 2001 From: hongxu Date: Sat, 16 Jan 2021 11:47:19 +0800 Subject: dpkg: add nativesdk support - Add nativesdk support and override EXTRA_OECONF and PROV for nativesdk - Replace ${bindir} with ${STAGING_BINDIR_NATIVE} for perl-native shebang to fix QA error of shebang too long in nativesdk build - Conditionally (except musl) add ldconfig to runtime depends to fix the following issue on target [snip] ... dpkg: warning: 'ldconfig' not found in PATH or not executable dpkg: error: 1 expected program not found in PATH or not executable Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and/sbin E: Sub-process /usr/bin/dpkg returned an error code (2) [snip] Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- meta/recipes-devtools/dpkg/dpkg.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 04fe85c4a8..3419aa56bf 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -26,6 +26,7 @@ EXTRA_OECONF = "\ " EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" +EXTRA_OECONF_append_class-nativesdk = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" PACKAGECONFIG = "liblzma" PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" @@ -46,14 +47,15 @@ do_install_append () { if [ "${PN}" = "dpkg-native" ]; then # update-alternatives doesn't have an offline mode rm ${D}${bindir}/update-alternatives - sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* else - sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* fi } PROV = "virtual/update-alternatives" PROV_class-native = "" +PROV_class-nativesdk = "" PROVIDES += "${PROV}" @@ -93,7 +95,8 @@ ALTERNATIVE_${PN}-start-stop = "start-stop-daemon" ALTERNATIVE_LINK_NAME[start-stop-daemon] = "${sbindir}/start-stop-daemon" ALTERNATIVE_PRIORITY = "100" -RDEPENDS_${PN} += "${PN}-start-stop" +EXTRA_RDPENDS = "ldconfig" +EXTRA_RDPENDS_libc-musl = "" +RDEPENDS_${PN} += "${PN}-start-stop ${EXTRA_RDPENDS}" - -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg