diff mbox series

[3/5] wget: merge .bb/.inc

Message ID 20260122153438.1546221-3-ross.burton@arm.com
State New
Headers show
Series [1/5] perl: provide pod2man | expand

Commit Message

Ross Burton Jan. 22, 2026, 3:34 p.m. UTC 
There's just a single recipe file that uses the .inc, so merge them.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-extended/wget/wget.inc       | 41 ----------------------
 meta/recipes-extended/wget/wget_1.25.0.bb | 42 ++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-extended/wget/wget.inc
diff mbox series

Patch

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
deleted file mode 100644
index 13cf879067..0000000000
--- a/meta/recipes-extended/wget/wget.inc
+++ /dev/null
@@ -1,41 +0,0 @@ 
-SUMMARY = "Console URL download utility supporting HTTP, FTP, etc"
-DESCRIPTION = "Wget is a network utility to retrieve files from the web using \
-HTTP(S) and FTP, the two most widely used internet protocols. It works \
-non-interactively, so it will work in the background, after having logged off. \
-The program supports recursive retrieval of web-authoring pages as well as \
-FTP sites"
-HOMEPAGE = "https://www.gnu.org/software/wget/"
-SECTION = "console/network"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6f65012d1daf98cb09b386cfb68df26b"
-
-inherit autotools gettext texinfo update-alternatives pkgconfig
-
-DEPENDS += "autoconf-archive-native"
-
-EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
-                --disable-rpath"
-
-EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \
-                 DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"'
-
-ALTERNATIVE:${PN} = "wget"
-ALTERNATIVE:${PN}:class-nativesdk = ""
-ALTERNATIVE_PRIORITY = "100"
-
-RRECOMMENDS:${PN} += "ca-certificates"
-
-BBCLASSEXTEND = "nativesdk"
-
-PACKAGECONFIG ??= "gnutls pcre2 zlib \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-PACKAGECONFIG[ares] = "--with-cares,--without-cares,c-ares"
-PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[iri] = "--enable-iri,--disable-iri,libidn2"
-PACKAGECONFIG[libpsl] = "--with-libpsl,--without-libpsl,libpsl"
-PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
-PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
-PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
-PACKAGECONFIG[pcre2] = "--enable-pcre2,--disable-pcre2,libpcre2"
-PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
diff --git a/meta/recipes-extended/wget/wget_1.25.0.bb b/meta/recipes-extended/wget/wget_1.25.0.bb
index 93fefc9092..87ccdeade2 100644
--- a/meta/recipes-extended/wget/wget_1.25.0.bb
+++ b/meta/recipes-extended/wget/wget_1.25.0.bb
@@ -1,7 +1,47 @@ 
+SUMMARY = "Console URL download utility supporting HTTP, FTP, etc"
+DESCRIPTION = "Wget is a network utility to retrieve files from the web using \
+HTTP(S) and FTP, the two most widely used internet protocols. It works \
+non-interactively, so it will work in the background, after having logged off. \
+The program supports recursive retrieval of web-authoring pages as well as \
+FTP sites"
+HOMEPAGE = "https://www.gnu.org/software/wget/"
+SECTION = "console/network"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6f65012d1daf98cb09b386cfb68df26b"
+
+inherit autotools gettext texinfo update-alternatives pkgconfig
+
+DEPENDS += "autoconf-archive-native"
+
 SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
            file://0002-improve-reproducibility.patch \
            "
 
 SRC_URI[sha256sum] = "766e48423e79359ea31e41db9e5c289675947a7fcf2efdcedb726ac9d0da3784"
 
-require wget.inc
+EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
+                --disable-rpath"
+
+EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \
+                 DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"'
+
+PACKAGECONFIG ??= "gnutls pcre2 zlib \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG[ares] = "--with-cares,--without-cares,c-ares"
+PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[iri] = "--enable-iri,--disable-iri,libidn2"
+PACKAGECONFIG[libpsl] = "--with-libpsl,--without-libpsl,libpsl"
+PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
+PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
+PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
+PACKAGECONFIG[pcre2] = "--enable-pcre2,--disable-pcre2,libpcre2"
+PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
+
+ALTERNATIVE:${PN} = "wget"
+ALTERNATIVE:${PN}:class-nativesdk = ""
+ALTERNATIVE_PRIORITY = "100"
+
+RRECOMMENDS:${PN} += "ca-certificates"
+
+BBCLASSEXTEND = "nativesdk"