From patchwork Mon Nov 10 07:22:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4563 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 10 Nov 2025 08:22:54 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AA7Mrd0015389 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Nov 2025 08:22:53 +0100 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-585b3594d16sf1358587e87.0 for ; Sun, 09 Nov 2025 23:22:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762759367; cv=pass; d=google.com; s=arc-20240605; b=F7GOllN0doleOIMDa7iHYyPRSnoTGSNZ0kAW7gNG5OsfLPm1/QYioaShp8idZ4Mcr1 Dg6zw3thZonB0/iCVtw7SvBg7MaArK+7cp4ppop55DiVTIBWk8NNI55WtdzeuSkicn8d tZ3ClMy0SMQ9xtrViYVHGuAWFdtUBcOI6JSuVXhC6d2chsWSaR3UAw9ZWoz6QX+X7WPb unKCd4QNF53DaH+BGxiKPOOKE16x2Y9+NOuFyP6ZJOp1lADlejEThLvU7DCw4FKrBoMn yrFBTSfs02EbNW4PVJiHC7XcBRi9AWoTS8iA59185oqK565qMnQmcMWsf53ouyNcM08x wO0A== 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=7UumGJthnGHmSK//iByCAQD/2243T4BNFqnRAsoP+JE=; fh=FBULwqL9WxAiiN1nHMDgPx5YJLRLsi+3lFzEZZNEGNI=; b=XqRYAJlZplj3WjuVILNbfJB8jR6uq4acyL+nlvChoqj3NRM4Y7U3X6Lpmlc+SzotR+ U1GDnQqFgB9rSaAZR+2UDyg4ECopekdDyU/Yza2SUcQop9AFmatkx5DdkaonFCO6Z+0G d63TvTgYjJsKL2jBTsdYBgclx1yPOhv203GPBoACynowjaY3BSjsPXAkyTk1Z1Gq01z0 sQQw5KowSVt5YVF8cbf4O/+lLuA41LNdXWx4MCNiP6M4aHR1bouYd+rVhbKulPv4lWtY caFX33CLCZOtdXfujwJNFPgFrcQ5qt4wWXXi15JT1JEb0abJV+ZlS06+n3Iwz0EBMK4B a+SA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WAr2D6hX; spf=pass (google.com: domain of fm-294854-202511100722429ec11cf63f000207de-heph_s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202511100722429ec11cf63f000207de-HEPh_s@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=1762759367; x=1763364167; 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=7UumGJthnGHmSK//iByCAQD/2243T4BNFqnRAsoP+JE=; b=LIEcjLhMFnCqWPNNKiFU7Kl3dPLhJIxkHJOzMGUncBFyqKgma2o8wRJ9Q0FXmslXaM sfkc2GmI1290q1x3saO3dCiOSqWJZWl0Sk+Aw5sNfyMUxDpSacbsNYu8Sfbk7nSQ7vSi FqQWUEtO4XkcBAqRPOUkqH7g5ryHCD8J4rqZJg9dgocHNGwTzs8svZN2jw1LwOcv6cCF X+C4UtUtMG9fA2Q9c96mgxauAaBWI0tZKhS+suxOZ+JNgzPOz/glqZLBT77GpOIG2vyz 6VjY8R8Uk8zGp3E1qVMJDH6lQzde+H6sG/WcRxpbU7Bns1t15PZB0oW+jQTg3nh89ev1 fNyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762759367; x=1763364167; 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=7UumGJthnGHmSK//iByCAQD/2243T4BNFqnRAsoP+JE=; b=IrMhdhkZzJb/XWFFEucPCzzFxVwKBROR/bWXLdUUsjM58GAkcfBt/M255l/rEPMAny yPmte2bUgtC9to/hrtmuRQMHrMQFGA2eLOqF0f6OXm0hx9UaDsAncBd1icGtm4s9J9Ig ObdASn1sCZrjjWNqfz7EKi05GN0mUvYslMS0mF//luwdhBUUcJgYliQbUgVXKMb6uSUG UK5CwbgICVMP6EYVImOlW2SvoHYUVh/MOetA4sAWfcCkUcFhvqXqQ+IdF2cI+AGd2XJ9 1UEhwpQkEB78Fi1tL6/oH3Ndwkwsdzs251DQk0oQ0oARWOH86CadXvjVE2FkkQUJe5Hh PZEQ== X-Forwarded-Encrypted: i=2; AJvYcCWEsOUbzG7/eo0Nqu/PL85nd3YwbO+0Jd5UsoVTh2hHxfrv89aWJiepNV/+xc8vWp8fBL+rPaw=@isar-build.org X-Gm-Message-State: AOJu0YwUFdmrB8Fjfc8ldbgLLRWZEGbYtlcYFHnWnkfHsDPVDogjLcbs cuRYlq4nqYMEEG+n6bK0xObQpz5dAoGmUNlmuznvRq1YBtf76hcVBFsR X-Google-Smtp-Source: AGHT+IEanM/gy/zOsn0B2flvPIwnfUi7VvykrmBa7zwifzWJUwjaWXnhN86x0WMkS1CJqMHTXVjzBw== X-Received: by 2002:a05:6512:3ba3:b0:594:2f46:391c with SMTP id 2adb3069b0e04-5945f1cb294mr1696451e87.44.1762759366585; Sun, 09 Nov 2025 23:22:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+aNLsX1jYdmsIAAjwrXIThREYxYlS6/grILlu4bpOLxOw==" Received: by 2002:a05:6512:24d5:b0:594:4c7a:d96e with SMTP id 2adb3069b0e04-5944c7adaddls1225498e87.2.-pod-prod-08-eu; Sun, 09 Nov 2025 23:22:43 -0800 (PST) X-Received: by 2002:a05:6512:3a8e:b0:577:285f:32bd with SMTP id 2adb3069b0e04-5945f1b6d40mr1657095e87.26.1762759363148; Sun, 09 Nov 2025 23:22:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762759363; cv=none; d=google.com; s=arc-20240605; b=TjkhBxjeq41o7nTHK4XxhmVAMDAwiTWPxIwlNMW31Uhssxq2bZJw4CmFIt2KG4oz+8 b81pQhVR/DfOfpFLxQvcE6xz1KeHEPD12KXcPJHzr9B4EwyzEa8+pprWPyafx3mHRojS ElO5VH/xpU1zObM0mWXvoIeB0EXr+Att5ZA70tutXEXbCvpQbpi8hrlIsComyfUY9Iiu 4tvM/vmqtmZxgmTRlit6fxrhrl8+GhZHKuZ7hE3hDIClQJiYwx1mZqT2dD+0dOj7Z4Sw W2T9fcgoC9smi/sXwcvD+g6Rc+mw6P8RHoa+PqaNHl3GOOvujfbmFQAJrKQIhn5Qrirj 009Q== 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=Oq4oHompZZW+rMmkxrIsK+JgTDrGgvJpQxtbB/XnJGLP98dBx9Z1EDiQQgZhwUVMcR w8b/WDQWdojglw8tM0jKQ41/RXa2IYUZ9mOyrVyzY7De21wjcjtKc/Mpfw/rUtsP265F lRpw+U6EwFpZ71PLzen816SQKA39S105Y/2FXQFvGgiFYRgfopB0TzbgT6x0GNldTn4K jJ6tfz5K7pC/cIwnB4HDD9SMLq9l1KHHBWatj/EQmvsRSpCsUpr7JawTSwh8WbiYFRkp cWG3yrCUg0y56ZPto9xBQMPQ9bSnHAazjRGP4TTBWLbVMapXqe9zfwN07OmcsuuJmFBq yr0w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=WAr2D6hX; spf=pass (google.com: domain of fm-294854-202511100722429ec11cf63f000207de-heph_s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202511100722429ec11cf63f000207de-HEPh_s@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 38308e7fff4ca-37a5f0ff762si551511fa.6.2025.11.09.23.22.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Nov 2025 23:22:43 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202511100722429ec11cf63f000207de-heph_s@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 202511100722429ec11cf63f000207de for ; Mon, 10 Nov 2025 08:22:43 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH v2 11/27] u-boot-custom: Migrate to a bbclass Date: Mon, 10 Nov 2025 08:22:24 +0100 Message-ID: <91b268a48e41d135c720d42d9cda115b095ad6ff.1762759360.git.jan.kiszka@siemens.com> 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=WAr2D6hX; spf=pass (google.com: domain of fm-294854-202511100722429ec11cf63f000207de-heph_s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202511100722429ec11cf63f000207de-HEPh_s@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