From patchwork Mon Mar 17 13:27:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59250 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 D8FE6C282EC for ; Mon, 17 Mar 2025 13:27:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.52488.1742218073230655202 for ; Mon, 17 Mar 2025 06:27:53 -0700 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 8AD6613D5 for ; Mon, 17 Mar 2025 06:28:01 -0700 (PDT) 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 4BC463F694 for ; Mon, 17 Mar 2025 06:27:52 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] mdadm: don't inherit autotools Date: Mon, 17 Mar 2025 13:27:47 +0000 Message-ID: <20250317132749.1778185-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 ; Mon, 17 Mar 2025 13:27:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213093 mdadm doesn't use autotools at all: - do_configure does nothing as it can't find configure.ac or configure - do_compile is overridden to pass SYSROOT - do_install is overridden but still calls autotools_do_install (which is just 'make install DESTDIR=$D') and then appended. Clean this up by passing SYSROOT and STRIP in EXTRA_OEMAKE, removing the now-obsolete do_compile(), and merging the do_install()s. Signed-off-by: Ross Burton --- meta/recipes-extended/mdadm/mdadm_4.3.bb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index 63c61b68c96..d90497d5a74 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb @@ -28,7 +28,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" -inherit autotools-brokensep ptest systemd +inherit ptest systemd DEPENDS = "udev" @@ -44,30 +44,19 @@ CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ - BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' + BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ + SYSROOT="${STAGING_DIR_TARGET}" STRIP=' DEBUG_OPTIMIZATION:append = " -Wno-error" -do_compile() { - oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -} - do_install() { - export STRIP="" - autotools_do_install -} - -do_install:append() { + oe_runmake 'DESTDIR=${D}' install install-systemd install -d ${D}/${sysconfdir}/ install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor } -do_install:append() { - oe_runmake install-systemd DESTDIR=${D} -} - do_compile_ptest() { oe_runmake test } From patchwork Mon Mar 17 13:27:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59249 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 E0CE8C28B30 for ; Mon, 17 Mar 2025 13:27:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.52311.1742218073576220995 for ; Mon, 17 Mar 2025 06:27:53 -0700 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 2F1CE1688 for ; Mon, 17 Mar 2025 06:28:02 -0700 (PDT) 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 E678B3F694 for ; Mon, 17 Mar 2025 06:27:52 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] dhcpcd: don't try to run autoreconf Date: Mon, 17 Mar 2025 13:27:48 +0000 Message-ID: <20250317132749.1778185-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250317132749.1778185-1-ross.burton@arm.com> References: <20250317132749.1778185-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 ; Mon, 17 Mar 2025 13:27:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213094 This recipe has a configure script that isn't actually autoconf but tries hard to look like it is. Instead of trying to run autoreconf, change do_configure to just run the configure script directly. Signed-off-by: Ross Burton --- meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb index 99b72852bf3..8bc2ad16a39 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.1.0.bb @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma SRCREV = "57c3506a5622e199cf0e3fc1ef26a71cdedc9521" S = "${WORKDIR}/git" +# Doesn't use automake so we can't do out-of-tree builds inherit pkgconfig autotools-brokensep systemd useradd SYSTEMD_SERVICE:${PN} = "dhcpcd.service" @@ -50,6 +51,12 @@ EXTRA_OECONF = "--enable-ipv4 \ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" +# This isn't autoconf but is instead a configure script that tries to look like +# autoconf, so just run it directly. +do_configure() { + oe_runconf +} + do_install:append () { # install systemd unit files install -d ${D}${systemd_system_unitdir} From patchwork Mon Mar 17 13:27:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59251 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 E1CF1C35FF9 for ; Mon, 17 Mar 2025 13:27:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.52312.1742218074345734396 for ; Mon, 17 Mar 2025 06:27:54 -0700 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 D26C913D5 for ; Mon, 17 Mar 2025 06:28:02 -0700 (PDT) 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 8CB933F694 for ; Mon, 17 Mar 2025 06:27:53 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] autotools: require that a configure script exists Date: Mon, 17 Mar 2025 13:27:49 +0000 Message-ID: <20250317132749.1778185-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250317132749.1778185-1-ross.burton@arm.com> References: <20250317132749.1778185-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 ; Mon, 17 Mar 2025 13:27:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213095 There's no point inheriting autotools if you're not actually going to run a configure script, so make a missing configure script fatal. Signed-off-by: Ross Burton --- meta/classes-recipe/autotools.bbclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index bffd8a7a057..948f8c183a7 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -206,11 +206,8 @@ autotools_do_configure() { ACLOCAL="$ACLOCAL" autoreconf -Wcross -Wno-obsolete --verbose --install --force ${EXTRA_AUTORECONF} || die "autoreconf execution failed." cd $olddir fi - if [ -e ${CONFIGURE_SCRIPT} ]; then - oe_runconf - else - bbnote "nothing to configure" - fi + + oe_runconf } autotools_do_compile() {