From patchwork Mon Nov 10 07:22:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4570 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:58 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f64.google.com (mail-ed1-f64.google.com [209.85.208.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AA7Mv4q015582 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Nov 2025 08:22:57 +0100 Received: by mail-ed1-f64.google.com with SMTP id 4fb4d7f45d1cf-640c4609713sf3692082a12.2 for ; Sun, 09 Nov 2025 23:22:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762759366; cv=pass; d=google.com; s=arc-20240605; b=RBHojy/LJwhvlAvxL+vbklrA27Hxyczl2du1QQfhcavF768EKqN1eQ5S3Lvu7/SP82 yu4fh4DI6YE+qIOKekjQaN3YQY7w3LTLXM+ywhiAw4kBmnJhXK8FFnU/Vh6OKaSI7wdv ktAOjCC25+J+2puqiAOtCcsV2oITNrGBCroWUMwaKK3j1XJta3qXtmZGHW2Xw0bUMfNd IctIztuFoVXjtreNl/I1uvZKeDFgqIVmKNlXMY08l1C9q2BpMWQuHYtkPTAiyLWYq2AB Or5ahfKt/RLVjzo5sXF2oZ7/oiyWJJEcKzNm49N0Mn721utQJ4+s77nF2XmGcYP9lFkf 1jvw== 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=j4vN5DuJJf3aVnZMe5jh7oBz72PEwHMmS1sBZo11Hy8=; fh=AKlDiAtHQrMYVbjhejXddilJIUS4L4/l9M6OLeW3HVc=; b=IU45IVWKPLPcJ7XXg0g+/m0sqxiRvlGvKYztPAA7rWQXAefYY6siEeqtuuO1DzISs0 TqiP1tyyxi+RFAyZDmufgnqNE4t2U6Ls9vv9ix4nKxOXXPZWF/OhunP2Y1L0Assk9PQV wCnd0FojWWJyXn4l2kzExheozz2RVV6PXOnXaX0vaKJvM0U+delqhBgc6e/CFEw7DZ+V zF8dYh/IF05fULRZPyQkFkX0g0tEdA6Odew8j4shQlRHlb59aDGJ+HyW6SQDLaDrmGB9 h/mi4fyWu5d0PbrhzdJNQ7ZjGP54pjH4oJljgPPRwmd7xpL//URkl5znrhh9jWKy2+DS DkKg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SOY4LtUu; spf=pass (google.com: domain of fm-294854-20251110072243c36a4b805600020786-5mwux6@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20251110072243c36a4b805600020786-5mWuX6@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=1762759366; x=1763364166; 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=j4vN5DuJJf3aVnZMe5jh7oBz72PEwHMmS1sBZo11Hy8=; b=UeVPD27PM579XJfa+8+xXI10oobqzcd1SLi8dWCldbwCXPNZzLKR62YV6JQoo44gzF fktok6fZXKurojBKwBbFU9bWP7olSufp8yDmWA/JPRsi3F7S2QM6FXFF6n1sXoALWZzV p5+JNUOYgjCZusF7fbhOmLM992Iy+nA1zTv0ecK5mDYaqqlt2/6ThQh9/iBRDdb+f6GM rlOz2sD5hWkgMtUEA2wjEYI/mr6wx+74MKoRV4ITiXFbzsFghhQMK4gBPrtd/EZ96mjM hDgqyYfOfxd1ncelywJdE0Xh4gleLI+/ubFmfixGDu5JIdCN1XkH1Nav7aGwI9ejzZnd FsGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762759366; x=1763364166; 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=j4vN5DuJJf3aVnZMe5jh7oBz72PEwHMmS1sBZo11Hy8=; b=ZGROjlkajnO5qUWDoqi74ZynbVO6sq4rpNzQkuHdwg6C+Mc7xLlxQ79nyiwgdGe0gi enaaf0ZCfldW3TLW6c72jnUFZdSx3jtnnsWTIvPU5/l1iCRw762lVpKvvWbyJWp40e28 CoAqe30e3CLXtNNdwLiV/TUW0S+T5xi0A5Y3najfRSEYDvLdABrIWcu8gZ27Vw69IQAg MRtdKTaKuNXPzsScREi0AfW5zJR60K1JpuQ8mQLkTcz3UmR3Pqs7r6Yjptr//b2FVjwt 51q2mZtfv78TR1vS24U1nCaNBl5QnmFfeugc0tocwcVLtNTQAb1qw7x2GAmPWHPY7j0r dhQw== X-Forwarded-Encrypted: i=2; AJvYcCW6Ecm8JrRoh9207q8v+LuZnjAsF4/o5pMJxVkHE3ffRCbUnwaqB4o3wAkXGzsaLOk3KqDiD0Q=@isar-build.org X-Gm-Message-State: AOJu0YwAF+b9ZdjZPcj+S1ft4Y5YYl2TC4q0OCvSWpi6Qm9TRI/ZCU/d TC22NOw3wAweOF/Ve02/hEsYlAnbyWNeoHmBw2zntEBTrU1T/UyDWZv3 X-Google-Smtp-Source: AGHT+IEYsAKMozCP8v1tUKhII0l99a+UuWbsEkNIIHTsSwgCR9xWIfI702F7b9O9anjSlkshom2ryA== X-Received: by 2002:a05:6402:13d0:b0:640:b2a1:8199 with SMTP id 4fb4d7f45d1cf-6415e820304mr4986982a12.36.1762759366124; Sun, 09 Nov 2025 23:22:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+ZxL6YiYw5KATMRUk38uyaRT7OczEQ8l2A27L9KMoXrHQ==" Received: by 2002:a50:ed15:0:b0:640:fcbe:ef7f with SMTP id 4fb4d7f45d1cf-64174ae7429ls862499a12.0.-pod-prod-08-eu; Sun, 09 Nov 2025 23:22:43 -0800 (PST) X-Received: by 2002:a17:907:86a9:b0:b70:b7d5:7eb with SMTP id a640c23a62f3a-b72e03182b2mr724348466b.27.1762759363214; 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=F3gZWWDzDFRL9smGx/+DmvZxlxK5uRKBHmtSY/XnbOWs32ZiThCnfwFEjcldEo3u9g uG2Qxkl6bmJLQNZI96476FmAmaH+2pf2KrGlp6EO/kST9UVjjsBJLUdgqKZ/zN1+dk+/ 9F8MV06JpISu1cpqczjBeFsFWtPMYEL/gu0ls7CvdoKlsfxmD043DDgCgZTpU6sSly8i pJsTvyHYtH3RMDaVo/CqAMkmRO58HS8tQT1hs0PEXl7DnCf09kZIYUkAr9tICJ0sTFlB ym4/Jj595kyyiuL3vjG3ysC/sf+hDcLExAx/4sjuIxr9sD3XnTPtO6avPoXnjqk/r/7y eGiQ== 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=bHB+yXfel2t+rpQ7E/Y3iXhezGg19VUBbBJXt35JGMd4GXQR3MQmIF8cM4bCVVMJdf Fhrykpywu/ihvA3Ekh7BQS1o8KxT/SrNusIYYn04br+lq6HlaeNyltDbe++K9MsTG1kp QBvT6gII6z9Nprp52GijTaw1iI5sHty75+MpBtvJTeSYPJQALWSjs6V2/KFHfQfL0l9o NJHhKCiopFTOGG/Rp1jh+Ogi/97rswwxk6rK1mOBjWX0dMGgtaxxX4cKQhgKMy6vKGml YeuKSPzlCpykfPMofKmF1uE2MtTveNcz9IsX7bfEUuHTt9iAwWEazK1ssbUmq4Ahp+EH /AJQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=SOY4LtUu; spf=pass (google.com: domain of fm-294854-20251110072243c36a4b805600020786-5mwux6@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20251110072243c36a4b805600020786-5mWuX6@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id a640c23a62f3a-b72bc08d36bsi13227866b.0.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-20251110072243c36a4b805600020786-5mwux6@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20251110072243c36a4b805600020786 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 13/27] optee-os[-tadevkit]-custom: Migrate to bbclass'es Date: Mon, 10 Nov 2025 08:22:26 +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=SOY4LtUu; spf=pass (google.com: domain of fm-294854-20251110072243c36a4b805600020786-5mwux6@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20251110072243c36a4b805600020786-5mWuX6@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} (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