From patchwork Fri Dec 16 15:37:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16849 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 444A8C4167B for ; Fri, 16 Dec 2022 15:36:55 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15921.1671205014204505750 for ; Fri, 16 Dec 2022 07:36:54 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: peter.hoyes@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 A474C1042; Fri, 16 Dec 2022 07:37:34 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3730C3F5A1; Fri, 16 Dec 2022 07:36:53 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 3/5] zephyr-core/zephyr-kernel: Use layer-relative require for version file Date: Fri, 16 Dec 2022 15:37:21 +0000 Message-Id: <20221216153723.1522131-3-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216153723.1522131-1-peter.hoyes@arm.com> References: <20221216153723.1522131-1-peter.hoyes@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, 16 Dec 2022 15:36:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58813 From: Peter Hoyes The inclusion of the Zephyr version-specific .inc file is currently using a local include. Change to be layer-relative to support including files in other layers. Change to use 'require' instead of 'include' so that an earlier error is printed if the file does not exist. Signed-off-by: Peter Hoyes --- .../recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index aa299e0..a19d074 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -13,4 +13,4 @@ S = "${WORKDIR}/git" # Default to a stable version PREFERRED_VERSION_zephyr-kernel ??= "3.2.0" -include zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc +require recipes-kernel/zephyr-kernel/zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc