From patchwork Wed Mar 19 17:41:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59532 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A376C36002 for ; Wed, 19 Mar 2025 17:42:08 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1082.1742406120266098826 for ; Wed, 19 Mar 2025 10:42:00 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 114AD113E for ; Wed, 19 Mar 2025 10:42:08 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9858B3F673 for ; Wed, 19 Mar 2025 10:41:59 -0700 (PDT) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH v2 09/12] miniupnpd: partial recipe rewrite Date: Wed, 19 Mar 2025 17:41:49 +0000 Message-ID: <20250319174152.706861-9-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250319174152.706861-1-ross.burton@arm.com> References: <20250319174152.706861-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 19 Mar 2025 17:42:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116094 This upstream does not in fact use autotools, so remove the inherit. Split the configure step (make config.h) into do_configure and ensure that it always runs in case the configuration has changed. Use PACKAGECONFIG for options, as there are more available upstream. Add UPSTREAM_CHECK variables to check for new releases. This depends on a bitbake change[1] but with that detects that 2.3.7 has been released. Add a DEPENDS on openssl as the Makefiles try to link against it and silently fail without it. [1] https://lore.kernel.org/bitbake-devel/20250319165339.439776-1-ross.burton@arm.com/T/#u Signed-off-by: Ross Burton --- .../miniupnpd/miniupnpd_2.1.20191006.bb | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb index 1c2f030f83..b7ba37f290 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -7,27 +7,31 @@ SECTION = "networking" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" -inherit autotools gettext pkgconfig systemd +inherit gettext pkgconfig systemd -DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" +DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack openssl" SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ file://miniupnpd.service \ file://0001-Add-OpenEmbedded-cross-compile-case.patch \ " -SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8" SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" -IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" +UPSTREAM_CHECK_URI = "https://miniupnp.tuxfamily.org/files/" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P\d+(\.\d+)+)\.tar" -do_configure:prepend() { - echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--ipv6" + +EXTRA_OEMAKE = "-f Makefile.linux" + +do_configure() { + echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded + CONFIG_OPTIONS="--leasefile --vendorcfg ${PACKAGECONFIG_CONFARGS}" oe_runmake --always-make config.h } do_compile() { - cd ${S} - CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux config.h - CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux + oe_runmake } do_install() {