From patchwork Sun Nov 30 09:27:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4676 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:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AU9S7aE005923 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 30 Nov 2025 10:28:07 +0100 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-477a0ddd1d4sf19423265e9.0 for ; Sun, 30 Nov 2025 01:28:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1764494874; cv=pass; d=google.com; s=arc-20240605; b=cB9qadUzCjUYjIgdrm1vCVFbGdLFvyrvc46aSU7hctvRC1QAjjfwPCaBZD/KhTQkXJ +eYVaA2iudT3D5g48sOEk6wEQLX48ULklsrjt8ttpy63uyQEF9tM4xQRS9qtnbtOlAJ0 nDQJvEPemX4RuHnTKugJmqoto0xSv4knLszch4vBsYW+dN97bZiD5MjMFJFXLt9Mplzz ELn1W6rYnajCSCMSM91sWH2OG/5HDgimzmAKf4VqC2emkigGIe4nuCvaKylO7EbtHQSw TvljLAyemU/63Pj9GmfJAzA1itXIDgIwGROjQtFUbfISEJeCS+375jaMCYXtDHD7VKuu 3HSg== 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=7scgv6MidjqRspOfpvvLtetTBRF5csue9/j646PwHtQ=; fh=Adp0hkK72B7FrESGpFoVpjqn8SsaaHSAC2jHV6BigvY=; b=c6Q6hCBF1CUYEqW2T4de+nt9cG0VzI6lvtRaLP40pZa26Kb5VUkYDgSABvSvQeydJP zdlmGG1B9NnH6gcmX2cszMLZMEZQaddldUco338oDUEMRwVktlzojBwJFtz95xEr+Mms 3/LVxJ7SYjtl7c5oKVVoMVGOZ3J3zEtHU10vuSdv1w51C/r8bM4XQolqKyzczsfX3MMr P9FeCnoRSSLk2bLqxWO2tC87HziMv66lU5ZWqTM3Il7G3n1hT4PJuk27tG2mz1xGHrO6 zhZ/W4JIdYTTiIQoJbheTx1x4x9B9cog9nWxjAI7C5JJueoIky9vbo/XTQKsdteuwn9g fP/g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Lj8BtFi1; spf=pass (google.com: domain of fm-294854-2025113009275036c4a35b00000207dd-vcihch@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-2025113009275036c4a35b00000207dd-VciHch@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=1764494874; x=1765099674; 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=7scgv6MidjqRspOfpvvLtetTBRF5csue9/j646PwHtQ=; b=FsFuGgjrJdotZD8D4BHdy8bSJaLcdW3YiuDLA+qXUmfoD6iSPgzj71xVkWrxtJbYNK SrS4QkPYeg9Aqeira3dPWmzwnKEFkgFJ0xF8r4N3PMRh7kgAdUxIyX/8yvROPNCSyB5N Kcam/HJoXsXRsGs6/8NZsgk0aqgmnIgTVZ4xMVkhXNBzIthmi/pJDdLNXbYwCBH4EUkD y4rLJf633u1moTEbZ93lz568A7NYQ8ssm3yq2xjrO25aJhqOM6hOV/ncuz33nS0+wTS5 D7wrDI9v4N1TrUVOA7KyFflWNhVAyO7N5VEVMXYUo9xrRNOWE8nhlqCwq/7YmKqkyytS P5cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764494874; x=1765099674; 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=7scgv6MidjqRspOfpvvLtetTBRF5csue9/j646PwHtQ=; b=f4Q1rZGY1bKCi8c7cAJoBtdj8UYOMR0MKU9iJf+BCfY2L8A7fTG7GLXHsIFF7nVzMA tzxf4Q7+1UFcRxvwbG4OgaRg/lEBpfRlDHRdbbZ4s30GETyKKEplVdwpFQyu2edgaqrN KsDm+9zw1gDR3REc9JTjFq+rsKNS1/PqGIwr3RQ0EqIEe4L3i3xRiQIHQ4fuofP8NZhS kCOKIkG1PXtuZcbx1HRNle4bXulmMyYof0YYly8XQ45yka/BSuFU3I9H5WdJrfQnAs9r yFnCak9gLzz/ugH3Dhxq1w3oAaYZsOjtDhmSBPkgbmSIj2tW7ql1B+bJhWCBUpLY2py7 gobA== X-Forwarded-Encrypted: i=2; AJvYcCWKwnoWumoaV+l2KJqi+wV+GBlfjYv5sw7rZq+WrK1J+P/S7GDVOLXienE+lXyVXYRADkrWy1I=@isar-build.org X-Gm-Message-State: AOJu0YykDOjis6ka5CLo6+5k9nquKn3UvEPMH/H+o7yr0zn6mgHEDqgj FijDFxaTf3NmJO4gjWj659rBuLKGXCKGXC30jWADuhUYjFJaNzT9VMya X-Google-Smtp-Source: AGHT+IFG6F4ymvJuQ5PsQdpfE8we/rLB4beD5t2oYGj+VHuz8GdWSvgoTky91GZQUEYgBqTPSbhdhA== X-Received: by 2002:a05:600c:19cd:b0:477:c37:2ea7 with SMTP id 5b1f17b1804b1-477c1115febmr266515345e9.21.1764494874000; Sun, 30 Nov 2025 01:27:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+bZbmT+w0CyJK4cFKWSa3+kfjKiv85h3b5IcRy4j+5qvg==" Received: by 2002:a05:600c:3152:b0:477:980b:bae9 with SMTP id 5b1f17b1804b1-4790fd18682ls19310795e9.0.-pod-prod-05-eu; Sun, 30 Nov 2025 01:27:51 -0800 (PST) X-Received: by 2002:a05:600c:5489:b0:45d:5c71:769a with SMTP id 5b1f17b1804b1-477c112400amr323936225e9.26.1764494870825; 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=YVBQ5NxoJfTtCuTbpaT3rztNNp1boymK0IcYDgnH0rSjzYhIx6qL8htvJK9K86Q2ol A1N566VpLv54YvDgt50juMK3ZbNowOlRyWFSEwn+q3qsmHKFLZv0N0GUck5u75Xn5XtR JiLDSZYciVwM/5ARMqg9OfjUfE3vPI6utCIM27Yke9rlV+VE/NG+rJiiwhDxrLfv3gCj sqiVdg5dhCGVwOq+6Vc8dN9MGEUXmYMEfV0zcfwqxtwBH6YbzNXnRinHSKp7cAUceIGw dUtAhT4+uf94Uy1EKUmn5jJuHIiCapkEU5TYOWoEuxAdvadaqUc9AcLem5DNaaXvHETR CFtg== 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=nTNeZmJwN+h3mEkTukX8ZLP9/pc3LyBwfc8n0tT/rak=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=gr9iVM4nnqDNFiJZLMd8Q/QN089MxqEyoXD+IbN+O2c/oVL3eFu2Lz7BUQQ7YA/gl6 6YQNitkK3zZRWCV+7UahJ9zujluCpu24B/Rbrfcos5EVE3DEp+rgdUWWCnr57/dL2/5R /iIkSamR4Li569YUMWsGFSDSBUaO0kJ3EWs/Qo/wJ+Pc1u9NwtIpx8EEun6UDzZ0nDP5 nNIJsctcyXQOeXtKAOE/XRqBp1THPDL6mxVYA0D5h8e7+7yi6/IwEGhPDnsQVN5rH5PX 7AhFUplNXk3t7EjDJz4IqjpWZi2/7bUr8ZL/uTHd6LWHK5pFBfZQUCAJ3nwTs9WHqRgH K6ig==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Lj8BtFi1; spf=pass (google.com: domain of fm-294854-2025113009275036c4a35b00000207dd-vcihch@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-2025113009275036c4a35b00000207dd-VciHch@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 5b1f17b1804b1-479052a86ffsi1184095e9.2.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-2025113009275036c4a35b00000207dd-vcihch@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 2025113009275036c4a35b00000207dd 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 15/27] optee-client: Migrate to a bbclass Date: Sun, 30 Nov 2025 10:27:35 +0100 Message-ID: <2a28fa21945e6d31a52a7aaff1a3723c1b2e6ff6.1764494867.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=Lj8BtFi1; spf=pass (google.com: domain of fm-294854-2025113009275036c4a35b00000207dd-vcihch@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-2025113009275036c4a35b00000207dd-VciHch@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-client" 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 --- .../optee-client.bbclass} | 9 +++-- .../optee-client/optee-client-custom.inc | 40 ++++--------------- 2 files changed, 13 insertions(+), 36 deletions(-) copy meta/{recipes-bsp/optee-client/optee-client-custom.inc => classes-recipe/optee-client.bbclass} (84%) diff --git a/meta/recipes-bsp/optee-client/optee-client-custom.inc b/meta/classes-recipe/optee-client.bbclass similarity index 84% copy from meta/recipes-bsp/optee-client/optee-client-custom.inc copy to meta/classes-recipe/optee-client.bbclass index e54c8763..40bf68c2 100644 --- a/meta/recipes-bsp/optee-client/optee-client-custom.inc +++ b/meta/classes-recipe/optee-client.bbclass @@ -9,13 +9,12 @@ inherit dpkg -FILESPATH:append := ":${FILE_DIRNAME}/files" - DESCRIPTION = "OPTee Client" PROVIDES = "libteec1 libckteec0 libseteec0 libteeacl0.1.0" PROVIDES += "optee-client-dev tee-supplicant" +FILESPATH:append = ":${LAYERDIR_core}/recipes-bsp/optee-client/files" SRC_URI += "file://debian" TEE_FS_PARENT_PATH ?= "/var/lib/optee-client/data/tee" @@ -23,7 +22,11 @@ TEE_FS_PARENT_PATH ?= "/var/lib/optee-client/data/tee" RPMB_EMU ?= "0" TEMPLATE_FILES = "debian/rules.tmpl debian/control.tmpl" -TEMPLATE_VARS += "DEBIAN_COMPAT TEE_FS_PARENT_PATH RPMB_EMU DEBIAN_STANDARDS_VERSION" +TEMPLATE_VARS += " \ + DEBIAN_COMPAT \ + DEBIAN_STANDARDS_VERSION \ + TEE_FS_PARENT_PATH \ + RPMB_EMU" do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build() { diff --git a/meta/recipes-bsp/optee-client/optee-client-custom.inc b/meta/recipes-bsp/optee-client/optee-client-custom.inc index e54c8763..dcc17637 100644 --- a/meta/recipes-bsp/optee-client/optee-client-custom.inc +++ b/meta/recipes-bsp/optee-client/optee-client-custom.inc @@ -1,42 +1,16 @@ +# Transitional include for optee-client.bbclass # -# Copyright (c) Siemens AG, 2023-2025 +# Copyright (c) Siemens AG, 2025 # # Authors: -# Su Bao Cheng +# Jan Kiszka # # SPDX-License-Identifier: MIT # -inherit dpkg +inherit optee-client -FILESPATH:append := ":${FILE_DIRNAME}/files" - -DESCRIPTION = "OPTee Client" - -PROVIDES = "libteec1 libckteec0 libseteec0 libteeacl0.1.0" -PROVIDES += "optee-client-dev tee-supplicant" - -SRC_URI += "file://debian" - -TEE_FS_PARENT_PATH ?= "/var/lib/optee-client/data/tee" -# To use the builtin RPMB emulation, change to 1 -RPMB_EMU ?= "0" - -TEMPLATE_FILES = "debian/rules.tmpl debian/control.tmpl" -TEMPLATE_VARS += "DEBIAN_COMPAT TEE_FS_PARENT_PATH RPMB_EMU DEBIAN_STANDARDS_VERSION" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build() { - cp -r ${WORKDIR}/debian ${S}/ - - deb_add_changelog - - echo "/usr/sbin/*" > ${S}/debian/tee-supplicant.install - echo "lib/optee_armtz/" > ${S}/debian/tee-supplicant.dirs - echo "usr/lib/tee-supplicant/plugins/" >> ${S}/debian/tee-supplicant.dirs - - echo "usr/lib/*/libteec*.so.*" > ${S}/debian/libteec1.install - - echo "usr/include/*" > ${S}/debian/optee-client-dev.install - echo "usr/lib/*/lib*.so" >> ${S}/debian/optee-client-dev.install +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-bsp/optee-client/optee-client-custom.inc\" to \"inherit optee-client\"" } +addtask warn_custom_inc before do_unpack