From patchwork Sun Nov 30 09:27:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4659 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:00 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f62.google.com (mail-ej1-f62.google.com [209.85.218.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AU9RxnT005355 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Nov 2025 10:27:59 +0100 Received: by mail-ej1-f62.google.com with SMTP id a640c23a62f3a-b72a8546d73sf380194966b.2 for ; Sun, 30 Nov 2025 01:27:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1764494873; cv=pass; d=google.com; s=arc-20240605; b=IixngO21qB0IAVcn4oF+8WjD+vB+e60gP9EJXCGP6mz3GCtrj5KQgVK1iH8iSePUwV drcoKGTtFXPOet/BJb8LE8yr+9v+9rCF6OwkxYtCzJdmoUgorqqOd3u+Lp4WA/sr6YjQ 7OxSpskolfk1+PVgZ3gs9xJE5zUT9wBgYtCl454b1xaHVKpRe95a8/NjYbUstSfNg56k 76sy8ZJOCWqqJA+zrX33JtXWZwHgbICpzRTMCwW77G+McDr+iHh+X7wN6qvpCQoxD+kj g9PB9FeW4A5PYof2JHGYJsxgcFLMELE9gxWTOkdsGAqsPEI9MyCFrmIxljve1eyif4XW DjHQ== 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=sji/XOBkD5QqTOkBVx8N3WFKW3N8frbxVPM0ms7jAuM=; fh=eMAmt6rZk63E/SwTA8PF95vNqsz62u5/05GYI6SirDg=; b=WNVUDPkKZFvPEzj6J84YS5s6gzxgH8h+pwf9uKW2iujI/L1NpqDHRQT+BbaJtaRsrC 5JtdiNeLpAtjAeRs8ENmWYmT/Q8L7bSzRRPUmx11DoFWHFghMtePbnkyVMP6u4UT953e 0hxHDXY+PCLWdxBrV1J0lTmdI+bSj7d8b9lk+NV11ROOx7cyPbtv5H4s/BIjuQ3FKg2p pcWawKmUwUovJ+dLsyTLtdJDs0RBzN5GHiZr0Cei8lDT118ea2dlJCpHGGS2gPX4Czkp IG8mw811HWRLj0tEHdUDHBm4cqgCEPrFMXqVoEQMLA5VgT6JBMxvnSJ9ekVF94nb5CCi ZsKg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=UQdDIfFD; spf=pass (google.com: domain of fm-294854-20251130092750f0bab5f8e60002079b-1ydzor@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20251130092750f0bab5f8e60002079b-1yDzOr@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=1764494873; x=1765099673; 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=sji/XOBkD5QqTOkBVx8N3WFKW3N8frbxVPM0ms7jAuM=; b=wAk+nNfaMjl3O4vvJw362JqIL2M8v3Y2csbNFZuK5feBFWxBQudKoYtLT69afuVXP7 Pjl9VTbL8ln3Pl0DxLUYo7alAzxtH3DmqrBxWhTGy1ZyC+x9WKPt/hzV/njuWOrQTxJg YOHaF6xERSplkTGVPHue+QbbA0381HQmST+wmzdILYFWr6wGwW5IzmeeBepaXm4eO+IX ulj/FWvMCk1g6u9BLpV0NU6PggZEIhGSpb4vhmW2BZ7fDBgBg4a3FlIK98rW1DFnl+Hj 6YSgcR5SQ+nZ+/eHmSCZdNBg1YIJiV3dFc9Ap9eK8HunTB7N707VFDSOon+nVKOsfJb6 Og/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764494873; x=1765099673; 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=sji/XOBkD5QqTOkBVx8N3WFKW3N8frbxVPM0ms7jAuM=; b=CDFX7+M0CA+Cg2rX6rO2DDyLopQ9eZY2mmdffl4x/b14Qx7RPP6Lv/Gy1uDKRtGadA ftN9X6CDnuOuCtA5Q20AAixxHAL00kmEEhZ0JkOcHj7N7R+Z9DKxauMRVfHqo1+fholg P89AT9Kr2Hrr6yzha2Sh/H6uf8rHdQ8eP9DNJdqr82EkFXYnsf2u6s5bezKGpCAP6/dM h+W9J8lA1WcIV7uDMTT0QyhEZrIkH90CRvP0DnnaonrM3nZjKQZrtowqpVblGpyMjJT2 kH2IF3F3F4EPhcnxN1v1lucLa81Tvu+MUz+bcWs1t51VdTk/L8yxIAe7Lb3eGBvvWdzw Ie6g== X-Forwarded-Encrypted: i=2; AJvYcCU0kd35cgmBDGfk+WqjRREMPoXFS0yXCLzb3JJAVug5YojnKXz0DCiaqEYaFbg9QKJTRZI5MTg=@isar-build.org X-Gm-Message-State: AOJu0Yx42dyj3NL0OC3NOFfVN6U7jE0cKzGl353YrMaRCDUvsKIrrIef 6Qk3FEykvAcD7p1z2gmdb0rVkJXaIvBY//DiT4DLjU6UCTOa5fKW5dvc X-Google-Smtp-Source: AGHT+IHbbcgcjRGWOKbUaUJb4CR/f1p9EiAaeg2cP0tj6wFJsPEM/rwelKGyZ5ULxcQ+Lr4ML7ffVg== X-Received: by 2002:a05:6402:51c7:b0:641:6872:8857 with SMTP id 4fb4d7f45d1cf-64555d2fc70mr32008718a12.34.1764494873542; Sun, 30 Nov 2025 01:27:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+b5PwiEDcrTDuw1Z6mi7t8CwCjgL/FjHPE/n0vFZM/6Mg==" Received: by 2002:aa7:d60f:0:b0:643:fe2:54cd with SMTP id 4fb4d7f45d1cf-6474197621als2874293a12.0.-pod-prod-06-eu; Sun, 30 Nov 2025 01:27:50 -0800 (PST) X-Received: by 2002:a17:907:3e86:b0:b73:926e:ddc6 with SMTP id a640c23a62f3a-b76716844c4mr3833412166b.10.1764494870573; 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=fNWp4LO8+M86TBIt64TGaCOjYDb0zhsi3G7sx0Zmo00hXCaZBdsQBfIpNiJILcuBP8 hrMgeSgSAXzirvLJi+plR39DbJpjbzEepaRYQf/3g2666Q8jpXgEuFb98vLaUT8V/70x ry8z26PsiOvi8Oswhxw9om811hVOFnZoddR4VoOesfha3oO5QJdFqMmLYCohlJgD3+fR EvrSTT6bwa0jToQ910USwSd051vLjCHGljRI7T2FHod4nXCjmkvIIP+AlDQFoCckApzv nzxaxsqRHpSb/QXrnzYNktMeFe9c5Heyf14BKPYCbeVGwVwO6Rmg+eTL4C5QdUyag/Bw 7Rww== 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=kuwtb0zwajwUodRFdgw/9wn2Z+8x/AvuNr8HNpuTmB0=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=UVt8VDwEQpPIWQQrncfgyAl73seAwjNTiadd0ITpPzSzbcghOG2EjNi4cd2b5QiK6M wJb+gp2z2/pgZwttd0azVrhlCSq8HojSqRFc4oxzYTCyuVB5bGdK0JCtKuJ/OuLllI6V RPgabmynk5Rm5uKrqnSuVNVBWJiNDoFEfBeV8oSzIHLoDo5unxvjxg11nZrTbmcCFctT H9n8hDHFTlG8SNds3MobcXcc6ODxjZYJ59rFr2Se3osSEP+qjfz3HavLxqH1fZ2tMY2p Edzazv5S9fmlR66bZgpf7vQh2uodsPT8cJBhq31NhQ4yYffHaCD3NnQrQKCa8XMX2JGK FeUg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=UQdDIfFD; spf=pass (google.com: domain of fm-294854-20251130092750f0bab5f8e60002079b-1ydzor@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20251130092750f0bab5f8e60002079b-1yDzOr@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 4fb4d7f45d1cf-6475102bd85si251313a12.7.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-20251130092750f0bab5f8e60002079b-1ydzor@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 20251130092750f0bab5f8e60002079b 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 13/27] optee-os[-tadevkit]-custom: Migrate to bbclass'es Date: Sun, 30 Nov 2025 10:27:33 +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=UQdDIfFD; spf=pass (google.com: domain of fm-294854-20251130092750f0bab5f8e60002079b-1ydzor@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20251130092750f0bab5f8e60002079b-1yDzOr@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_H3,RCVD_IN_MSPIKE_WL, 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 optee-os[-tadevkit]" is shorter and a more common pattern compared to OE/yocto. Keep the original .inc files as transitional helpers, issuing a warning when they are used with a migration suggestion. Signed-off-by: Jan Kiszka --- .../optee-os-base.bbclass} | 3 +-- .../optee-os-tadevkit.bbclass} | 2 +- .../optee-os.bbclass} | 4 +-- meta/recipes-bsp/optee-os/optee-os-custom.inc | 19 +++++--------- .../optee-os/optee-os-tadevkit-custom.inc | 25 +++++-------------- 5 files changed, 16 insertions(+), 37 deletions(-) rename meta/{recipes-bsp/optee-os/optee-os.inc => classes-recipe/optee-os-base.bbclass} (93%) copy meta/{recipes-bsp/optee-os/optee-os-tadevkit-custom.inc => classes-recipe/optee-os-tadevkit.bbclass} (97%) copy meta/{recipes-bsp/optee-os/optee-os-custom.inc => classes-recipe/optee-os.bbclass} (88%) diff --git a/meta/recipes-bsp/optee-os/optee-os.inc b/meta/classes-recipe/optee-os-base.bbclass similarity index 93% rename from meta/recipes-bsp/optee-os/optee-os.inc rename to meta/classes-recipe/optee-os-base.bbclass index a534ddf4..0e782429 100644 --- a/meta/recipes-bsp/optee-os/optee-os.inc +++ b/meta/classes-recipe/optee-os-base.bbclass @@ -7,8 +7,7 @@ inherit dpkg -FILESPATH:append := ":${FILE_DIRNAME}/files" - +FILESPATH:append = ":${LAYERDIR_core}/recipes-bsp/optee-os/files" SRC_URI += "file://debian/" DESCRIPTION ?= "Custom OP-TEE OS" diff --git a/meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc b/meta/classes-recipe/optee-os-tadevkit.bbclass similarity index 97% copy from meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc copy to meta/classes-recipe/optee-os-tadevkit.bbclass index cfb2cfd5..77d63d02 100644 --- a/meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc +++ b/meta/classes-recipe/optee-os-tadevkit.bbclass @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: MIT -require optee-os.inc +inherit optee-os-base DEBIAN_PACKAGE_NAME = "optee-os-tadevkit-${OPTEE_NAME}" DESCRIPTION:append = ", trust application development kit." diff --git a/meta/recipes-bsp/optee-os/optee-os-custom.inc b/meta/classes-recipe/optee-os.bbclass similarity index 88% copy from meta/recipes-bsp/optee-os/optee-os-custom.inc copy to meta/classes-recipe/optee-os.bbclass index abe46e81..48f97bee 100644 --- a/meta/recipes-bsp/optee-os/optee-os-custom.inc +++ b/meta/classes-recipe/optee-os.bbclass @@ -1,11 +1,11 @@ # Custom OP-TEE OS build # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2020-2023 +# Copyright (c) Siemens AG, 2020-2025 # # SPDX-License-Identifier: MIT -require optee-os.inc +inherit optee-os-base DESCRIPTION:append = ", firmware binaries" diff --git a/meta/recipes-bsp/optee-os/optee-os-custom.inc b/meta/recipes-bsp/optee-os/optee-os-custom.inc index abe46e81..1f4ebf7e 100644 --- a/meta/recipes-bsp/optee-os/optee-os-custom.inc +++ b/meta/recipes-bsp/optee-os/optee-os-custom.inc @@ -1,20 +1,13 @@ -# Custom OP-TEE OS build +# Transitional include for optee-os.bbclass # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2020-2023 +# Copyright (c) Siemens AG, 2025 # # SPDX-License-Identifier: MIT -require optee-os.inc +inherir optee-os -DESCRIPTION:append = ", firmware binaries" - -PROVIDES += "optee-os-${OPTEE_NAME}" - -do_prepare_build:append() { - rm -f ${S}/debian/optee-os-${OPTEE_NAME}.install - for binary in ${OPTEE_BINARIES}; do - echo "out/arm-plat-${OPTEE_PLATFORM_BASE}/core/$binary /usr/lib/optee-os/${OPTEE_NAME}/" >> \ - ${S}/debian/optee-os-${OPTEE_NAME}.install - done +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-bsp/optee-os/optee-os-custom.inc\" to \"inherit optee-os\"" } +addtask warn_custom_inc before do_unpack diff --git a/meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc b/meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc index cfb2cfd5..bc011567 100644 --- a/meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc +++ b/meta/recipes-bsp/optee-os/optee-os-tadevkit-custom.inc @@ -1,26 +1,13 @@ -# Custom OP-TEE OS build for TA devkit +# Transitional include for optee-os-tadevkit.bbclass # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2023 +# Copyright (c) Siemens AG, 2025 # # SPDX-License-Identifier: MIT -require optee-os.inc +inherit optee-os-tadevkit -DEBIAN_PACKAGE_NAME = "optee-os-tadevkit-${OPTEE_NAME}" -DESCRIPTION:append = ", trust application development kit." - -PROVIDES += "${DEBIAN_PACKAGE_NAME}" - -do_prepare_build:append() { - if [ "${DISTRO_ARCH}" = "arm64" ]; then - TADEVKIT_DIR="export-ta_arm64" - elif [ "${DISTRO_ARCH}" = "armhf" ]; then - TADEVKIT_DIR="export-ta_arm32" - else - bbfatal "${DISTRO_ARCH} does not have a compat arch for optee TA devkit!" - fi - - echo "out/arm-plat-${OPTEE_PLATFORM_BASE}/${TADEVKIT_DIR} /usr/lib/optee-os/${OPTEE_NAME}/" > \ - ${S}/debian/optee-os-tadevkit-${OPTEE_NAME}.install +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-bsp/optee-os/optee-os-tadevkit-custom.inc\" to \"inherit optee-os-tadevkit\"" } +addtask warn_custom_inc before do_unpack