diff options
author | Ross Burton <ross.burton@arm.com> | 2025-03-19 17:41:49 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-03-19 11:37:48 -0700 |
commit | 672062bb3ad6024d73b900fbf79aa64d8b4373a5 (patch) | |
tree | c826fc105168a429031ca2c80f5c436fbb216f8e /meta-networking | |
parent | 7b4314bc72fa278748eb9f927e19dd7e4fee3a7a (diff) | |
download | meta-openembedded-672062bb3ad6024d73b900fbf79aa64d8b4373a5.tar.gz |
miniupnpd: partial recipe rewrite
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 <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb | 22 |
1 files 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" | |||
7 | LICENSE = "BSD-3-Clause" | 7 | LICENSE = "BSD-3-Clause" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a1ed15843ce66639bcf9f109cf247870" |
9 | 9 | ||
10 | inherit autotools gettext pkgconfig systemd | 10 | inherit gettext pkgconfig systemd |
11 | 11 | ||
12 | DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" | 12 | DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack openssl" |
13 | 13 | ||
14 | SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ | 14 | SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;downloadfilename=${BP}.tar.gz \ |
15 | file://miniupnpd.service \ | 15 | file://miniupnpd.service \ |
16 | file://0001-Add-OpenEmbedded-cross-compile-case.patch \ | 16 | file://0001-Add-OpenEmbedded-cross-compile-case.patch \ |
17 | " | 17 | " |
18 | SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8" | ||
19 | SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" | 18 | SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d" |
20 | 19 | ||
21 | IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" | 20 | UPSTREAM_CHECK_URI = "https://miniupnp.tuxfamily.org/files/" |
21 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar" | ||
22 | 22 | ||
23 | do_configure:prepend() { | 23 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
24 | echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded | 24 | PACKAGECONFIG[ipv6] = "--ipv6" |
25 | |||
26 | EXTRA_OEMAKE = "-f Makefile.linux" | ||
27 | |||
28 | do_configure() { | ||
29 | echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded | ||
30 | CONFIG_OPTIONS="--leasefile --vendorcfg ${PACKAGECONFIG_CONFARGS}" oe_runmake --always-make config.h | ||
25 | } | 31 | } |
26 | 32 | ||
27 | do_compile() { | 33 | do_compile() { |
28 | cd ${S} | 34 | oe_runmake |
29 | CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux config.h | ||
30 | CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux | ||
31 | } | 35 | } |
32 | 36 | ||
33 | do_install() { | 37 | do_install() { |