From patchwork Wed Feb 25 12:37:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 81932 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 7C4D7FD3756 for ; Wed, 25 Feb 2026 12:37:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.44240.1772023051954850126 for ; Wed, 25 Feb 2026 04:37:32 -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 35C27165C for ; Wed, 25 Feb 2026 04:37:25 -0800 (PST) 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 326703F59E for ; Wed, 25 Feb 2026 04:37:31 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] readline: improve aclocal.m4 handling Date: Wed, 25 Feb 2026 12:37:23 +0000 Message-ID: <20260225123727.2043715-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 25 Feb 2026 12:37:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/231963 I don't know why I decided to copy aclocal.m4 to acinclude.m4 to avoid autotools.bbclass deleting the upstream hand-maintained aclocal.m4, but I did. A neater fix is to exclude aclocal, which has the side-effect of not deleting aclocal.m4 in do_configure. Signed-off-by: Ross Burton --- meta/recipes-core/readline/readline.inc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 555bd0876f9..06630dc455c 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -17,17 +17,13 @@ SRC_URI += "file://inputrc" inherit autotools texinfo -EXTRA_AUTORECONF += "--exclude=autoheader" +# Ensure we don't delete the shipped aclocal.m4 or config.h.in +EXTRA_AUTORECONF += "--exclude=autoheader,aclocal" + EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library" LEAD_SONAME = "libreadline.so" -do_configure:prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - do_install:append () { # Make install doesn't properly install these oe_libinstall -so -C shlib libhistory ${D}${libdir} From patchwork Wed Feb 25 12:37:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 81934 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 86B57FD375C for ; Wed, 25 Feb 2026 12:37:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.44124.1772023052637111406 for ; Wed, 25 Feb 2026 04:37:32 -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 B66C81691 for ; Wed, 25 Feb 2026 04:37:25 -0800 (PST) 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 BE45C3F59E for ; Wed, 25 Feb 2026 04:37:31 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] lzop: improve aclocal.m4 handling Date: Wed, 25 Feb 2026 12:37:24 +0000 Message-ID: <20260225123727.2043715-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260225123727.2043715-1-ross.burton@arm.com> References: <20260225123727.2043715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 25 Feb 2026 12:37:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/231964 This upstream has a hand-maintained aclocal.m4 which we don't want to delete (autotools.bbclass does this). For some reason this was worked around by shipping a copy of aclocal.m4 as acinclude.m4 and dropping that into the build tree. A better solution is to just exclude aclocal in EXTRA_AUTORECONF, which has the side-effect of not removing the file. Signed-off-by: Ross Burton --- meta/recipes-support/lzop/lzop_1.04.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta/recipes-support/lzop/lzop_1.04.bb b/meta/recipes-support/lzop/lzop_1.04.bb index c32aa534228..57c2190cf40 100644 --- a/meta/recipes-support/lzop/lzop_1.04.bb +++ b/meta/recipes-support/lzop/lzop_1.04.bb @@ -12,15 +12,12 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8" -SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \ - file://acinclude.m4 \ - " +SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz" SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41" inherit autotools -do_configure:prepend () { - install -Dm 0644 ${UNPACKDIR}/acinclude.m4 ${S}/acinclude.m4 -} +# Ensure we don't delete the shipped aclocal.m4 +EXTRA_AUTORECONF += "--exclude=aclocal" BBCLASSEXTEND = "native nativesdk" From patchwork Wed Feb 25 12:37:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 81933 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 76AEAFD3758 for ; Wed, 25 Feb 2026 12:37:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.44241.1772023053012845782 for ; Wed, 25 Feb 2026 04:37:33 -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 4FDA3165C for ; Wed, 25 Feb 2026 04:37:26 -0800 (PST) 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 4C2773F59E for ; Wed, 25 Feb 2026 04:37:32 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] rxvt: improve aclocal.m4 handling Date: Wed, 25 Feb 2026 12:37:25 +0000 Message-ID: <20260225123727.2043715-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260225123727.2043715-1-ross.burton@arm.com> References: <20260225123727.2043715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 25 Feb 2026 12:37:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/231965 I don't know why we copy aclocal.m4 to acinclude.m4 to avoid autotools.bbclass deleting the upstream hand-maintained aclocal.m4, but we do. A neater fix is to exclude aclocal, which has the side-effect of not deleting aclocal.m4 in do_configure. Signed-off-by: Ross Burton --- meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 2eab0d4ec4c..5a1b44a71c3 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -36,11 +36,8 @@ EXTRA_OECONF = "--enable-xim \ PACKAGECONFIG ??= "" PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," -do_configure:prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} +# Ensure we don't delete the shipped aclocal.m4 +EXTRA_AUTORECONF += "--exclude=aclocal" do_compile:prepend () { echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h From patchwork Wed Feb 25 12:37:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 81935 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 756AEFD375D for ; Wed, 25 Feb 2026 12:37:43 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.44125.1772023053483504554 for ; Wed, 25 Feb 2026 04:37:33 -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 CEFD3165C for ; Wed, 25 Feb 2026 04:37:26 -0800 (PST) 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 D6BBC3F59E for ; Wed, 25 Feb 2026 04:37:32 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] autotools: remove deletion of aclocal.m4 Date: Wed, 25 Feb 2026 12:37:26 +0000 Message-ID: <20260225123727.2043715-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260225123727.2043715-1-ross.burton@arm.com> References: <20260225123727.2043715-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 25 Feb 2026 12:37:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/231966 We've historically[1] deleted any aclocal.m4 file in the source tree before autoreconfing on the grounds that it is "too shy" to overwrite aclocal.m4, so we forcibly delete the aclocal.m4 unless aclocal has been excluded in autoreconf. However, this shyness has been removed in autoconf 2.70[2] and autoreconf will always call aclocal, which will rewrite the file if needed. So, remove the explicit deletion of aclocal.m4. I've verified that a build of all recipes in core that use autotools have identical aclocal.m4 files before and after this change. [1] This code appears in oe-classic during 2011 but originated in a BitKeeper commit, so predates our use of git. [2] autoconf bc7e12e7 ("autoreconf: drop support for old (< 1.8) aclocal versions") Signed-off-by: Ross Burton --- meta/classes-recipe/autotools.bbclass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index bd477dc60f0..bf580086698 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -166,13 +166,6 @@ autotools_do_configure() { cd ${AUTOTOOLS_SCRIPT_PATH} # aclocal looks in the native sysroot by default, so tell it to also look in the target sysroot. ACLOCAL="aclocal --aclocal-path=${STAGING_DATADIR}/aclocal/" - # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look - # like it was auto-generated. Work around this by blowing it away - # by hand, unless the package specifically asked not to run aclocal. - if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then - bbnote Removing existing aclocal.m4 - rm -f aclocal.m4 - fi if [ -e configure.in ]; then CONFIGURE_AC=configure.in else