From patchwork Fri Jan 24 14:33:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 56049 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 C0B47C0218C for ; Fri, 24 Jan 2025 14:34:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13339.1737729246329954420 for ; Fri, 24 Jan 2025 06:34:06 -0800 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 BDC7C497 for ; Fri, 24 Jan 2025 06:34:33 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.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 82D753F694 for ; Fri, 24 Jan 2025 06:34:05 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/4] ncftp: update for autoconf changes in core Date: Fri, 24 Jan 2025 14:33:58 +0000 Message-ID: <20250124143401.1635224-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Fri, 24 Jan 2025 14:34:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115062 ACLOCALEXTRAPATH is no longer used, so pass the required -I via EXTRA_AUTORECONF. Also explicitly disable aclocal as the aclocal is hand-maintained. Signed-off-by: Ross Burton --- meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb index de111cac05..be92e35d31 100644 --- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb +++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb @@ -12,6 +12,7 @@ SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \ " SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" +# Doesn't use automake inherit autotools-brokensep pkgconfig CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" @@ -19,8 +20,8 @@ CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" PACKAGECONFIG ??= "" PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," +EXTRA_AUTORECONF += "--exclude=aclocal -I ${S}/autoconf_local" EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" -ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local" do_install () { install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} From patchwork Fri Jan 24 14:33:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 56051 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 D3D06C0218B for ; Fri, 24 Jan 2025 14:34:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.13341.1737729246972195874 for ; Fri, 24 Jan 2025 06:34:07 -0800 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 6D27F497 for ; Fri, 24 Jan 2025 06:34:34 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.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 2A7683F694 for ; Fri, 24 Jan 2025 06:34:06 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/4] php: cleanup autoconf fettling Date: Fri, 24 Jan 2025 14:33:59 +0000 Message-ID: <20250124143401.1635224-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250124143401.1635224-1-ross.burton@arm.com> References: <20250124143401.1635224-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 ; Fri, 24 Jan 2025 14:34:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115063 This autoconf manipulation is very old and appears to be obsolete now. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/php/php_8.2.26.bb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-oe/recipes-devtools/php/php_8.2.26.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb index f5e57ab36a..f2363c8e54 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.26.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb @@ -136,10 +136,7 @@ LDFLAGS:append:riscv64 = " -latomic" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" -acpaths = "" - do_configure:prepend () { - rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' } @@ -162,11 +159,6 @@ do_install:append:class-native() { rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* } -do_install:prepend() { - cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ - ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 -} - do_install:prepend:class-target() { if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then # Install dummy config file so apxs doesn't fail From patchwork Fri Jan 24 14:34:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 56052 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 C1D68C0218D for ; Fri, 24 Jan 2025 14:34:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13241.1737729247597344280 for ; Fri, 24 Jan 2025 06:34:07 -0800 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 1E074497 for ; Fri, 24 Jan 2025 06:34:35 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.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 CF4723F694 for ; Fri, 24 Jan 2025 06:34:06 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 3/4] syslog-ng: remove obsolete double-run of configure Date: Fri, 24 Jan 2025 14:34:00 +0000 Message-ID: <20250124143401.1635224-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250124143401.1635224-1-ross.burton@arm.com> References: <20250124143401.1635224-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 ; Fri, 24 Jan 2025 14:34:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115064 There do not appear to be libtool problems with syslog-ng, so the requirement to double-run autoreconf from 2017 must have been resolved. Signed-off-by: Ross Burton --- meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb index 588a38126b..e489287c5a 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb @@ -64,15 +64,6 @@ PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wra PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," PACKAGECONFIG[native] = "--enable-native,--disable-native,," -do_configure:prepend() { - olddir=$(pwd) - cd ${AUTOTOOLS_SCRIPT_PATH} - - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed." - - cd $olddir -} - do_install:append() { install -d ${D}${sysconfdir}/${BPN} install -d ${D}${sysconfdir}/init.d From patchwork Fri Jan 24 14:34:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 56050 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 BBB35C02181 for ; Fri, 24 Jan 2025 14:34:13 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.13243.1737729248370106236 for ; Fri, 24 Jan 2025 06:34:08 -0800 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 C8C83497 for ; Fri, 24 Jan 2025 06:34:35 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.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 802003F694 for ; Fri, 24 Jan 2025 06:34:07 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 4/4] ntp: set CONFIG_SITE in do_compile Date: Fri, 24 Jan 2025 14:34:01 +0000 Message-ID: <20250124143401.1635224-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250124143401.1635224-1-ross.burton@arm.com> References: <20250124143401.1635224-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 ; Fri, 24 Jan 2025 14:34:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115065 Recent changes in to the autotools class in core means that it no longer sets CONFIG_SITE for compile tasks. However, ntp decides to reconfigure itself mid-build, so the CONFIG_SITE values are lost. Signed-off-by: Ross Burton --- meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb index 302cf9915f..6fae993482 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb @@ -55,6 +55,11 @@ CVE_STATUS_NTP = " \ inherit autotools update-rc.d useradd systemd pkgconfig +# For some reason this recipe reconfigures the nested configure.ac files in +# do_compile because libtool.m4 is newer than aclocal.m4, and that then +# doesn't know about the site configuration. +do_compile[prefuncs] += "autotools_sitefiles" + # The ac_cv_header_readline_history is to stop ntpdc depending on either # readline or curses EXTRA_OECONF += "--with-net-snmp-config=no \