From patchwork Mon Nov 3 11:51:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4501 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 03 Nov 2025 12:52:37 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5A3BqYwe000909 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 3 Nov 2025 12:52:35 +0100 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-4770c37331fsf31342415e9.3 for ; Mon, 03 Nov 2025 03:52:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762170741; cv=pass; d=google.com; s=arc-20240605; b=AEw3oCOeJuX+zom/7y0HDLcT36Til7eDsItaf4WrfN0Qob+fgq+cnFmYWLBLIbNx9m ARLE/uHNhfkkAm7jmDY2cx/xFagiqMU+7GZCcbpBFP7QKfZCj9hNza46DF84Jk9/Tv1i 8yaWehYakjkgCtHlxC1JF9dydMz7w+sWkY0JjuVALjYVEXSgX2cHObhbwN0lP8BIztWf XhqbZ2om+Kc2ug40zn5NGjfZOYnSA1lw1qbMJs4vTIO91H7SgKUYvSw1L+WQMFlPokp/ /y6Y4VadPi4Ml8hwkL0y5mZ76ql0Nb1O6pzsbgvLvfscJl0kIM57agXlDaDuJkgRhvCa Nt+w== 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=+LXIK+jaBZkUn/h5j1eEdhSJiYAkYJgRmtlHaz/gM1A=; fh=sWwb0HTDra00aq7QmpcF34txLdxl89AeN/E8Etddh0E=; b=jzIx9At59hIk8dSE0zyJEL2UcUs1vQeLctfyxeP46/jkOjQ0wPXKoOpyebLDSOf70u 9BCUEra4mFRLsk2JCYSnpqyRIcCCGQlJI3XC5WQaNEw2hpNIR4rM9It29Xh9+lpJanfo svFNOciEMX9iBZQu6utGP4niBRFFeqAOhX+OU2VXnNMJ9pIlr5rCjbAg/L0SGzBHICOH 3yNN8Cvr5xNdbg2ZCPQZy/UbqjpxpUcsGgn3hSkFVn8plnsK1crLDCH8mHSKKt4oozgO 41q/KTzJFs6VI7muLi6V4M+D7Xlb9XzhpxVpFByXagibqi8pGY3fSTdi6zGLYn3ni0hv KhuQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fOXLXOmi; spf=pass (google.com: domain of fm-294854-2025110311521793f61df9cb000207dc-vwrnzi@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521793f61df9cb000207dc-VWrnzI@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=1762170741; x=1762775541; 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=+LXIK+jaBZkUn/h5j1eEdhSJiYAkYJgRmtlHaz/gM1A=; b=RaB5FNDqsqDcdsWra0e/2Jv5WJl6Z7kcECkSgGosRy3BA85Rdwo4fnm+WcJU6tiThY JbOPQS4Em120WFVV495i2Ihs4ArZk502yHpfviO0Z0WqY4Z7TEAO+COgiPSx71jB4HqK CvIPY+AFU60wfs2+qB6+Qzg8R+tN68pCxDjHxrBJBprVEC1Vx4aDNNg54jZ7sXWFPfTW 3dhGak4AVAIPXVIqu/fAZw6pISHIhGL6VuYPV+ZHDe4+iPlG2nf/ZnJGka/lyPnOIqV8 6wTa21XR6uS0jW95Pip2wXgznqES4Tul81g3CesbnbyaK740yr5Uoe7Wc56A93rrJrMx 4cXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762170741; x=1762775541; 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=+LXIK+jaBZkUn/h5j1eEdhSJiYAkYJgRmtlHaz/gM1A=; b=fjYx02D2Aqna8sO1CWPepJHiawTH8a44cdM8oV5d9qFhYjwC0P+FSqzel83N4YH4+9 0CoDdLWkGG4oHrgvtyOC9DQHPNNpEUhOCPRnIjyLUzXeKFvhjJE6Vy/zmvuXXnM/q0VI z3kt4EgYjxK8TUNwNM+RisZ8TxJFfim10SqY7cEgYD0PU+2tZC4asIn552VPa6IKGDgk IOq12V5QzflVbFhgwWf0chyvXv5x/358evU1mLrUIQi22XbNZBbm42QWYsUpMmvWt/P9 wB8COBW2sYm60t4Wf8fz0HGDILRXiXPVY/TV9B+wU/D0fTUN4+I72Xunl8dmAIkSDVJU z/DA== X-Forwarded-Encrypted: i=2; AJvYcCWvJJCemiPOcJMjc5PFZNeKSeWzlPXdbBUigrgPX7U0uAGgzWOjmJSB4dBfK4/4eoPUCb/xLqc=@isar-build.org X-Gm-Message-State: AOJu0YxiEiJ4Fi0F5Rx9aozeViawSlthijZSJNr/LJa9pvKabQvaf0mv s3pI0qpoBXYVHdeYPFnlLRRq6jpWr+pXk4b1sJNOITl+rf1K5qm8/xHY X-Google-Smtp-Source: AGHT+IEWkGkPEmZiUcfKXNr9+nFbgWIfm+zfF3wO0TJh6mcVQsPcyhr4O9zG/7DDilim0hvJ5M3XRQ== X-Received: by 2002:a05:600c:4ec6:b0:477:3012:d269 with SMTP id 5b1f17b1804b1-477305a35dcmr107315225e9.5.1762170740932; Mon, 03 Nov 2025 03:52:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+bFJGxP0fi+IbkoF2UjeX8boE7SlbzWm4fEzDsxh6MJ8Q==" Received: by 2002:a05:6000:2c0e:b0:428:52bf:bc00 with SMTP id ffacd0b85a97d-429b4e02c1bls3235499f8f.2.-pod-prod-06-eu; Mon, 03 Nov 2025 03:52:18 -0800 (PST) X-Received: by 2002:a05:6000:2601:b0:429:d41b:9fe5 with SMTP id ffacd0b85a97d-429d41ba1f5mr2061599f8f.24.1762170737840; Mon, 03 Nov 2025 03:52:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762170737; cv=none; d=google.com; s=arc-20240605; b=AIrECV988AhH8zoXYSbb/TilYDWAsPhmC/cU/mI7J5aNBqIl8kkmKgRfAVj5JXH2OF 8rZFCC6SbRqN+12/7pNSt2wMpL2lkqOlmNKhL4nb8puO82NS4vibJN3qvXdz6OYKL6Fx u0GW7+0gI69/KokU6SmS3hQEDYsYcua/6+q5vFQLIpqL8tH6Yi/cxvYrtmUGyEY5FEWD U01JdROkq59Mj/QB6m5n4Vuz5FEfjnDSrc4DkDO0/LDrxFpwl6GbSW589m96YY/YiIOy CLLoOp4GnvE095iQykh8lRmbN//YeZjz4xZwRgKj+IDqp82aszShBoWFIYXj2dc7oVXd m1zQ== 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=YfzyMr5z4+0G1oETRz0LhiEBZAdt+dzbFougl9PMnI8=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=Z7+s7xlTb1xI/WTiNcMYSN61FKczvwSdKReSA/D5ryjTWFuAg/FMCtiCEX2ghGR7eq HO7Qm076B9qs4py/td/45K9wQ+HACl8Ym/o2gzDTfLHxGlKf3bWkGdgY0wtDUuOZ0Dhq NVbZKxE31Lu1KoQTA6rQq29vNHMVRqEcA5hBNOYLLQJgf51qMcrSayftFrtET1/+xPWp dbugcSHAUZ2eJVlcrzk3BMpdbhkgZULQu62kDE92HgBcJhpwKseLw48q/br/7TQhaFaf HT9H+7sjL28JTNObenUJAaArmSgtApJtTnD70ILnS3glbInuKq9XiWLjcXjj+WA6Z90U +3Ag==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fOXLXOmi; spf=pass (google.com: domain of fm-294854-2025110311521793f61df9cb000207dc-vwrnzi@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521793f61df9cb000207dc-VWrnzI@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-429c52169cesi156092f8f.0.2025.11.03.03.52.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2025 03:52:17 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-2025110311521793f61df9cb000207dc-vwrnzi@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2025110311521793f61df9cb000207dc for ; Mon, 03 Nov 2025 12:52:17 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH 11/27] u-boot-custom: Migrate to a bbclass Date: Mon, 3 Nov 2025 12:51:59 +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=fOXLXOmi; spf=pass (google.com: domain of fm-294854-2025110311521793f61df9cb000207dc-vwrnzi@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521793f61df9cb000207dc-VWrnzI@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 2d6dd8e0..02e1491f 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 2d6dd8e0..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" - -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