From patchwork Mon Nov 3 11:52:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4505 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:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f59.google.com (mail-wr1-f59.google.com [209.85.221.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5A3Bqb3E001307 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 3 Nov 2025 12:52:38 +0100 Received: by mail-wr1-f59.google.com with SMTP id ffacd0b85a97d-429cce847c4sf710651f8f.2 for ; Mon, 03 Nov 2025 03:52:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762170741; cv=pass; d=google.com; s=arc-20240605; b=b3RpDQxM+zR8t8frRRydXXajwDHx6vJgYbMvfj8kzv1PouBc5EGgsQkY+DVs4QN4tz OIyFYmfXapYt9ebxIDonQds7xRuGIyVV1Y450lmIz9+jDczpFdD6FAUvEc5euOL+8JwX nNQ/rOvyJrGifu+ifcJk5gVhHB26kHdAIoYKEPlalvsJGE2ioLbe4Sqd2K3CcSBUOOHi sWAtdDBQ2R98OL8iOoqshamRtHUDTzQTxWnW0GQxnnFr3kfSH1Z+T4xQAEDAHrxKnwP7 G3sF1XQ1PrWyLGQqxSUfsUx9513g21yYxQQ8YnDXZg/3zRq5lk6uVYhlTGaqCq8VRIkf VcCg== 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=lyIMuxx80EiG9xopUsGBZsUrspZULPW6nzlqm+Pc4hE=; fh=ONdq8zPn7JIKgGr4Oh4/IKE8xP/8cquMdQQsOblVYY8=; b=R9FLUNmYefHwUXH4aUKsHE9mdb71EDGZEe4gHnXT3QHFx6XM4FkWfIvy4RCYGKSD0c Z40KuUdZmeHQEJ7QlfgBoj4GROgyNS1WfTbH8R3aNHalFS/hiocNzdWdWUIacitX+WmL VCNUsq2XceKBMjbufktFPde7kTvnM860oyRxY+WCt47aBRZZVAHzRb5/EFyg3Tv6tW1w kgrtxkelNa6/4ttJd7aqqG6r1wvJaHo/QeNcmKSqHLczV/D4qOPOqCERbvtC7qDu5xua Ds2WWASHZ6rayjT19GZJV3zLNaHzZJrWb+EX9mC1r2W9nlNkjI81VOrQl0/mVU3igVJ2 1zMw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nkkevwau; spf=pass (google.com: domain of fm-294854-202511031152178568e4233d000207e6-udxim3@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202511031152178568e4233d000207e6-UDXIM3@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=lyIMuxx80EiG9xopUsGBZsUrspZULPW6nzlqm+Pc4hE=; b=VEQMaTw6+ydYg3uKaqSAFUnoiSKOTbj+fhMhWY7Qr71rNyftl1otjk5a+S51n8wzXZ cmiwg8B7tnwgpw/5e5m21l43uWEausmM1DNsjgk+N9+WxfqWGsm+243lqtpOjc8bn2uf U4MKC1ueWLqPGamW2YcIzXJ1Q919DgiKLzR8g4Ho/w6o4JaR48QhPxZNn0dWuuli0pLR hFNeLjizHYdgD82UCrvjkj8PRGIgNb+ruZL0vtU1i1D3PD32KgIpMJ86xDiVTCWWCahS Js7uZpgzqGIX3U3J1XH6GOEnJmjQskU69eHK5ekafUyfNJ2tY0G9qFstlgdiNKD1dFKK pdzw== 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=lyIMuxx80EiG9xopUsGBZsUrspZULPW6nzlqm+Pc4hE=; b=uZ1weJTv0OOYbjnIYWNpsXEKD+nQFOJzccBgjNGWJYOuOv/Bw3kSAhcJxqHcxJaIeH oqmsJu+20iSf9qR7bwbeH3ElvZJOYrYT6He84dP1bua/3kiwmuJ7vL9eAVBfT+s/agY9 jlTYfbjYUQdxoJnVadOaj6x0MzV3+JbSsGLpGseabARetywQGOBKMQEkmntsPfNEzvd8 3X1WH8KNApLOlSDXeBYW+jwTSzWSrG5eQjb+NdogdKWbXxbAf+PxiRPt0u1MNsaPeNQT QsDIuXj6Jk3vNzo8CxLdiI5BDEvYe8X/FcWNFENaWphyfV0pZ+1zT38x7xtvv65BfFWG Uyew== X-Forwarded-Encrypted: i=2; AJvYcCVRwIguj5Ottplk+jstzri3POovuVcRxDP1cPRPSmCaeUurRhZ7Rk2nRFo4Dt0Tif6M0kKuKng=@isar-build.org X-Gm-Message-State: AOJu0YxmcffS2geFdpQIzjKjGPKQSf3sk/owiAuHIQ6NSIrhYhCX/rBG OdBXeyJeSeIyjI5dYvPpHGs5ntjS5byzNE0mH/eAwK4DgkVg2EpG7FbL X-Google-Smtp-Source: AGHT+IFVykrUIL3tiTlW5f5WVTz9zCKhm0jS439N7J8/AUx03TcXqaDS20hj8leOtylU1NTwdquwuQ== X-Received: by 2002:a05:6000:2404:b0:428:bb7:174f with SMTP id ffacd0b85a97d-429bd68d0bemr10805195f8f.26.1762170741255; Mon, 03 Nov 2025 03:52:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+Z/8KdCXfdslG02NtyAF1ZzpCMPpk0eDwjRFL/Qie7dWA==" Received: by 2002:a05:6000:230b:b0:3ea:bccc:2a04 with SMTP id ffacd0b85a97d-429b4df97e9ls2257512f8f.2.-pod-prod-03-eu; Mon, 03 Nov 2025 03:52:18 -0800 (PST) X-Received: by 2002:a05:6000:2306:b0:3ea:80ec:8552 with SMTP id ffacd0b85a97d-429bd6e3d86mr10109431f8f.57.1762170738044; Mon, 03 Nov 2025 03:52:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762170738; cv=none; d=google.com; s=arc-20240605; b=CwymhaGplyoE/u8soXg4C7BO4JpoIac6X4/GcEXg9amkPh5ODa0GODFulE8c4zr5H7 cwDukL/CFjoQlMZ7jGwdIWN2EbNyn7zsN6LqxhPYFB7cv2AO/o+qxMZcUGM/erdld3Fd z1LnMLDkMKG1BK5xRjYxgGS+w3jDKmCuIEkjz2PoFX2ZnJfxrYtgXLQSL8jfMiv0oyCw k3ISrc0hn6erSBUc1Sq1hqV5ZAhaDLxWvQ2Yspgxdx24sXDh17ZOC/U/C8N74x5Z+i+Z fsGV3wlFJyQTF2Xh+BCqIC2T0Krkyd8JvTtf+MTNvAqghjkfL6I89XzWhSHcLEXBdGnr HY3w== 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=GqVqJf+VM6BUAd+JCDpaOL+e+5XV/RqaZ1pT1mvofH8=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=Ep5HW8SXbhbq9JD0x2nDQ2t437LmTIZ9kcYAXmD9PwT+OVi007ksEcE+U1zpZ1fZ07 K7edPDWcB1EQW3Qk8MZ3ZLonExLvz+hOlPFAFRhG544tnekD/xRGVFWCdZU5hKStwSip s28cEs3+S07g+9iAmbD4N1Oec+NR192ciE44oK2zsmV5Ve5isJkcRVKXmYZKVElLBbSj WspwZiwuXo263mW7fNxtmRAPQhTWLa1J6FjCR7KVSLiMSH9ekJgQy36dtBXPz3NusMzt cWU7FRBodun2FHx2yTX4zet/v+YJ1AoSJrSaGh0/4SvrBTc8Fzk+GHCakxRz2Ov8FZj0 8WEw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Nkkevwau; spf=pass (google.com: domain of fm-294854-202511031152178568e4233d000207e6-udxim3@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202511031152178568e4233d000207e6-UDXIM3@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.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2025 03:52:18 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202511031152178568e4233d000207e6-udxim3@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 202511031152178568e4233d000207e6 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 13/27] optee-os[-tadevkit]-custom: Migrate to bbclass'es Date: Mon, 3 Nov 2025 12:52:01 +0100 Message-ID: <2c41d8e09fb52933c4ef2f049d40b812f32aedee.1762170735.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=Nkkevwau; spf=pass (google.com: domain of fm-294854-202511031152178568e4233d000207e6-udxim3@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202511031152178568e4233d000207e6-UDXIM3@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 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} (92%) 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 92% rename from meta/recipes-bsp/optee-os/optee-os.inc rename to meta/classes-recipe/optee-os-base.bbclass index eac75ae8..58305383 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