From patchwork Sun Nov 30 09:27:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4663 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sun, 30 Nov 2025 10:28:02 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AU9S1lX005406 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Nov 2025 10:28:01 +0100 Received: by mail-wm1-f64.google.com with SMTP id 5b1f17b1804b1-477964c22e0sf18600625e9.0 for ; Sun, 30 Nov 2025 01:28:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1764494874; cv=pass; d=google.com; s=arc-20240605; b=D3qZ5AFOhtYQoHdRqnaBnCuYS49ObpAVhx1ztFjPBJg4MQNd+AmYA1wbYipT9TYuCX wM2ygUwVH0CjASmUk+ytBONOFUzCUehfRfcgC7icQ/oRlEFh9oErXX4Yxu3hTjhumTpN BQ9b2wwnBIi837cuUBgBxbxbxl/rETuxQeneXKNrZhbtfEzpdeHMxXnP6NKhfCcj5DE/ k4j2YjPM6TYbA0hvQGUwPpBZcodmWJS4maullyukxuuxkOcs7uK4Qe44rd2EicvtQE6Y ig9Vd/iWfer9DCsXBgMkp5ypqFChGNd7yTbsOg6kFB1QX5fQiyIuFnbl60vcvxjnDvXy 01kQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=/u4UJ+TY6+SxtJbRhLtgg1Vn1X9udJzD6Z02vG9YaQE=; fh=Uw1kX6NPvV3dlBZRt7t6FlSF7iAsEedm0i6+MMkgakM=; b=VR3qzJ45MWE14xkHxZmKZXsVNhsUSWbIcq6LQXwTl22j/JmCBIAgafu35eIAkzPPI4 NNq7ITq4rsIQ3KQ0jyJaD5qwHnuLIZxjP2RB1ZrSrKaSIbCX5FSlWedQQBg+V8gehwYM XXQXw5v+/lY8YLM5B9avrx522jbneKjhlRe8zAPMNw8VZH4pVClkXUG8Fg9Rka+oEH8+ 8NmqMzFUUGYHcA56orbUOtT5r18cF+kWtAFQuHKHWYW7TFre+dURRH460Q06cs/0oSE2 uniCf/QYzVSihKuWEE5Z+L/2OZhiVIJBJ4EbtBc2OJPu8F/MPUPpA2KZum7JuQHcIA+L Ngtw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="B/Bgf+Y5"; spf=pass (google.com: domain of fm-294854-20251130092750d79c50baa9000207f4-62nw2v@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251130092750d79c50baa9000207f4-62nW2V@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1764494874; x=1765099674; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=/u4UJ+TY6+SxtJbRhLtgg1Vn1X9udJzD6Z02vG9YaQE=; b=I+0rEVPavD6AuNm083cYYm8FsIltVH+FaClnZfEdBcBpcEbXhBrur/+u/lQV1R4HlI cKKkiQsatBFtWQWPU4/A010psDQhdUihO2AkqrLgtEhQev6pTEnMKtLuQnYu132t+kh7 YgqR8/Vd+AJz1uxn22qG/bXBSOdtK0h7sKcNtiFZexxFWss43PkeFYJrkPG+9CoAVrRs AF5OZv/LjfeV5OHGOM0Ym8Ij9QIcfneNX6iC6uOeILFQ5ZGkUoEYNuq4ZIH5G6t82MJa GsowB6BTnpRIC7hGHJg6AX4gQL5+84KV46GrX6A63vDyXudvIhN8PQcvgbxYZU0POwI/ 2FrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764494874; x=1765099674; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/u4UJ+TY6+SxtJbRhLtgg1Vn1X9udJzD6Z02vG9YaQE=; b=U3UlL99rUtQfBNmuHRLb6vGee1avx2MHfAc2fFOubw4/Cubas0YYsq3jfGYiXUbpLn fc8g3NwrqA60mp1ggzGBV5+FOMHCjZgP4Q0AN+llkWsnpW+0n9kxmUeJJkoGDlmZWNe6 secntwTH6s0p8kHzwmYYg5X11vEqCnXsmyWNrkcSqB9inshLeB0b6wwUsvnJR2O/E2AB nxGZ21iGb+iHgntHA3MC2npLDn3Eb8oU7626O/mL8Hj/A9D1k0Zsvf1z4r1mMxF4e56H lC0lxP7SHyPSE83T9A6z/zVri3K1l4+TIW+KIKXIerlp1xyTh1EYY5S/EH0hE23kLUBs VTdw== X-Forwarded-Encrypted: i=2; AJvYcCWp7414JqRiLWRiA70+8hokk6y6Pr3xD7ZNKAlYALCNhj7WnJRE8KYAv1dsFf7/T3eRdNlfuAg=@isar-build.org X-Gm-Message-State: AOJu0Yx3Hyc4aZhx52Euuroaneh3cu/tlgKaW9GwT8du082vB6eF0Hba NdrbqpPTeGovfO/F5hLWpzVWgFsf75fL4Edq5G1kDWCZiIN95WYYE1zB X-Google-Smtp-Source: AGHT+IFd6cC0oNpz5AgDJE0nU1rMfh2dpwEz+l450b0nD1v/pYAEmV4tb1uTOhUCTba2sXXstTSSPQ== X-Received: by 2002:a05:600c:3ba7:b0:46e:59bd:f7e2 with SMTP id 5b1f17b1804b1-477c05139c2mr439789765e9.11.1764494873405; Sun, 30 Nov 2025 01:27:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+Z8xtcMnN3rYwKRbKFMAEkFF2v4U9kkjf9+kHY5o+Xh7g==" Received: by 2002:a05:600d:8445:10b0:477:2205:db97 with SMTP id 5b1f17b1804b1-4790aaf1d4als7169955e9.0.-pod-prod-00-eu-canary; Sun, 30 Nov 2025 01:27:50 -0800 (PST) X-Received: by 2002:a5d:5f82:0:b0:42b:5448:7b34 with SMTP id ffacd0b85a97d-42cc1301cffmr40068415f8f.7.1764494870244; Sun, 30 Nov 2025 01:27:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1764494870; cv=none; d=google.com; s=arc-20240605; b=P7XHscF93h7hdtEd0vV5mBRDyTS4z/U9l+QMfAcydNOAZteLcI1VeDcq29fFtccciO iWF0izruFdXRbs7DLNhib07X4WxM26e7MtHk/8rHq9zPEMO0dSn06m6gW1NOnEAvSb5J 3e+lD8aoTGVrdoTnirfbaWbcADAs7+QPpvQVGI7eKvu1fmpkRYBkULDzp1dy0hy1PGM0 pg9RJ76KLpdr9ZLuZzj8UgQ392jZMs9/8fnOj88+CBrq74ujvM/mcZYyufTbkGBOk+AK kLfEsySxSjf++fqKhM7MlVHaFwof18FKu6hOngW7Ul0bqW6E9j5/y8t79jMB4kcq6mx3 dyDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=H4k2V9L2aYeQNj+Bqrgv4lpuXgZ3OaTJTKQ2uUQsXwg=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=daRyGtHHokRQeBVELOip/91V94wEN+pQOzRh4sHExtyq0VXePSbRh/CTQVAO1kZfFV fth+WAeFXGR/oaDW2v1hBDtJspNMkdtyi0EvTQXFyoBu7sM0Mi7k3idB3v3sG7KjjR1f CAKUdYL5JqK5YeKFpJeEUNe1/Q81S0Wu1+vNP16p/goIVPcdBs6pny+QBzTa5g+FvpTQ j5CVn1y42x/zpKxM4cSUUYCkYoTNKwxnFjKooFCSIfqpcfytHesXdHGjw3aPN/u6QAMD 9PZVyYIekUPCfbIr3anuZCFQSLc6bOttnU9Aw3/3OWBBg69vahaK+LJN9G+wMyiiap12 FwmA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="B/Bgf+Y5"; spf=pass (google.com: domain of fm-294854-20251130092750d79c50baa9000207f4-62nw2v@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251130092750d79c50baa9000207f4-62nW2V@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-42e1ca546f2si117384f8f.8.2025.11.30.01.27.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Nov 2025 01:27:50 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20251130092750d79c50baa9000207f4-62nw2v@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20251130092750d79c50baa9000207f4 for ; Sun, 30 Nov 2025 10:27:50 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH v3 11/27] u-boot-custom: Migrate to a bbclass Date: Sun, 30 Nov 2025 10:27:31 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="B/Bgf+Y5"; spf=pass (google.com: domain of fm-294854-20251130092750d79c50baa9000207f4-62nw2v@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251130092750d79c50baa9000207f4-62nW2V@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka "inherit u-boot" is shorter and a more common pattern compared to OE/yocto. Keep the original .inc file as transitional helper, issuing a warning when it's used with a migration suggestion. Signed-off-by: Jan Kiszka --- .../u-boot.bbclass} | 3 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 74 ++----------------- 2 files changed, 7 insertions(+), 70 deletions(-) copy meta/{recipes-bsp/u-boot/u-boot-custom.inc => classes-recipe/u-boot.bbclass} (96%) diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/classes-recipe/u-boot.bbclass similarity index 96% copy from meta/recipes-bsp/u-boot/u-boot-custom.inc copy to meta/classes-recipe/u-boot.bbclass index c6b3e8cf..9277127b 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/classes-recipe/u-boot.bbclass @@ -5,8 +5,6 @@ # # SPDX-License-Identifier: MIT -FILESPATH:append := ":${FILE_DIRNAME}/files" - DESCRIPTION ?= "Custom U-Boot" PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev" @@ -16,6 +14,7 @@ PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \ inherit dpkg +FILESPATH:append = ":${LAYERDIR_core}/recipes-bsp/u-boot/files" SRC_URI += "file://debian/" DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index c6b3e8cf..9cc2c15f 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -1,75 +1,13 @@ -# Custom U-Boot build +# Transitional include for u-boot.bbclass # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018-2025 +# Copyright (c) Siemens AG, 2025 # # SPDX-License-Identifier: MIT -FILESPATH:append := ":${FILE_DIRNAME}/files" +inherit u-boot -DESCRIPTION ?= "Custom U-Boot" - -PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev" -PROVIDES += "${@'u-boot-tools' if bb.utils.to_boolean(d.getVar('U_BOOT_TOOLS_PACKAGE')) else ''}" -PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \ - if bb.utils.to_boolean(d.getVar('U_BOOT_CONFIG_PACKAGE')) else ''}" - -inherit dpkg - -SRC_URI += "file://debian/" - -DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" - -U_BOOT_BIN_INSTALL ?= "${U_BOOT_BIN}" - -U_BOOT_EXTRA_BUILDARGS ??= "BL31=${BL31} TEE=${TEE}" - -TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" -TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN \ - U_BOOT_EXTRA_BUILDARGS DEBIAN_COMPAT DEBIAN_STANDARDS_VERSION" - -U_BOOT_TOOLS_PACKAGE ?= "0" -U_BOOT_CONFIG_PACKAGE ?= "0" - -do_prepare_build() { - cp -r ${WORKDIR}/debian ${S}/ - - deb_add_changelog - - rm -f ${S}/debian/u-boot-${MACHINE}.install - for bin in ${U_BOOT_BIN_INSTALL}; do - echo "$bin /usr/lib/u-boot/${MACHINE}" >> \ - ${S}/debian/u-boot-${MACHINE}.install - done - - echo "tools/env/libubootenv.a usr/lib" > \ - ${S}/debian/u-boot-${MACHINE}-dev.install - - if [ "${U_BOOT_TOOLS_PACKAGE}" = "1" ]; then - cat <>${S}/debian/control - -Package: u-boot-tools -Architecture: linux-any -Depends: \${shlibs:Depends}, \${misc:Depends} -Description: ${DESCRIPTION}, companion tools -EOF - fi - - if [ "${U_BOOT_CONFIG_PACKAGE}" = "1" ]; then - cp ${WORKDIR}/fw_env.config ${S}/ || \ - die "U_BOOT_CONFIG_PACKAGE requires a fw_env.config in SRC_URI" - - cat <>${S}/debian/control - -Package: u-boot-${MACHINE}-config -Provides: u-boot-config -Architecture: ${DISTRO_ARCH} -Description: ${DESCRIPTION}, environment configuration -EOF - - cat <>${S}/debian/u-boot-${MACHINE}-config.install -u-boot-initial-env /etc -fw_env.config /etc -EOF - fi +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-bsp/u-boot/u-boot-custom.inc\" to \"inherit u-boot\"" } +addtask warn_custom_inc before do_unpack