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"