From patchwork Mon Nov 3 11:52:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 4491 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:31 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5A3BqUDr000438 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 3 Nov 2025 12:52:30 +0100 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-57986226b53sf2023795e87.3 for ; Mon, 03 Nov 2025 03:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762170742; cv=pass; d=google.com; s=arc-20240605; b=ODU9zmYGkM25rIRYVesAkGq30ZGGPXQb7n3ewHAl3HCFguGwvWKVaA8TUuNJE58PzU /sty4lTTldX80Rua2hTD45jfts+0pcJW4FycpjcaIMgmfO7RdimMqNvwpe7+Qfp7qiZ3 FD/QaTlNEioNHh/Uu9Phcezwndyqhma/wllPiX3jbNFuosg+vVczpbokDgek2IiWbGeh 2sCNsfbdyzEyiDlvKKIfF1IqxgyUzjtKq9NneJwEY1AWkmf06Yo+ClvYakuivnIwQALo cbvvc+xoSxP2aB/VOqCA+Ib4F2AgfkVrER6Jo4E45+9pDP1Z0plmWwcD7xe4x9jPhR3N 3K/w== 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=M0pNG8L8kbQK++2vwn2ELtbsD19u5T7so7TJXX/PMeM=; fh=GpmJWjfrjB8SQYmJYIvf768QCqr6ZaYZiyTDlRpKLRM=; b=GHuEqhdJUAnE8int+Q3ZAaeLH+D4Q+55p+ZXXROEse+Uw84Sec1ESgvhOAmzNsWbmD L98/XGmKs82I5neQs8jKre3fBAMyGDZ8FzrMtW5pLPtcxcV2HjJxAEGo9GlWFqLaLrgm jDMMrsyGZ7hzifYRqVtQtqOfy3aN2F/aXX08hn/wkWUrQSYocKUoYzCIS504w2G/yxoV nf+Dmy/RJBCyqwKNsXSNHbSuSe1wQPApNFxL9FAaKLSrzmu1D5UitTBk/kaDx+8OJL6C D4UoLNyd3CuyPgcLEPzvAuIOSgmjPCGygDQXLMONMpf5ZwkRJh6Yo3bVC19CX08Adb+j aMNg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NmNLnCV3; spf=pass (google.com: domain of fm-294854-2025110311521887c5e0b29f0002075e-yz8yd1@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521887c5e0b29f0002075e-yz8YD1@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=1762170742; x=1762775542; 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=M0pNG8L8kbQK++2vwn2ELtbsD19u5T7so7TJXX/PMeM=; b=wpzWKg6iqK/6dC7b/ZckACEnREshS0YKoFI8R2LfUv8ctScazX59vVx72q5qiO4eTC pUjkm6n6SGMFxqxRZ8f3OmE8rg0rfCJA63vW2/vM8qKlSNXDDkBWTQczLWtJcPEe5UwG Wnu9eAOANBZh38NXXT8Yp2WU1BoorPXZSacUVYv9jlUSQYQYRCMiuV8OVGHQiW30QvTb SmpWe7yZR9x7wSB7VHZIr7ebm1FKt9fuQ6B0YvHfaxvVd+dbLwzuA/4MPqBTGGljYR5z 9fl/pGsT9elG4hMBSton+Y+XdAmB+/bj5Qf68AXPM5adqYwSkfi+8K3HR/dEGQp8gER8 F1lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762170742; x=1762775542; 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=M0pNG8L8kbQK++2vwn2ELtbsD19u5T7so7TJXX/PMeM=; b=BfZxhSNUT4ID6HlCMvmiu6mwtezMwXb/S8gqD9aKLzDsAw1FoC04snoHEI0NAawg3Z +ySGtH8qIbUDlYoaO9b1AeUvrpek6TloTeNxYabOCfJovr8IbX3pMFMZfMm1ceOPE0OP 9zbNBsJfgoVU72USLaSxHb0/RlLN4UFZMl1RQ/MoC1DSeCl50U7h9M2WJlPJWVUdYMw8 gDCXXKKr2jiyWEIvt2ERHljk/AeanmPLguduyEQl60Ap9/BH5eUuVMGeYv73ffR/FtnH xjXH2ZBf1QlrI4HDKf5Srd5Ps+3JoHiXcJ8ZZezknAl47vpu/LDRNsXbaOgDcZ3iGDup 11oA== X-Forwarded-Encrypted: i=2; AJvYcCWA0PIXTXvsCzh2eY/Uz65mHCvtawao5b3IC12wNDPrCoCO6zRbAhKTPVlBNY8lO0kHFdeB5GA=@isar-build.org X-Gm-Message-State: AOJu0YyE7cms27RBB1tzwh1/9c9G/rLQtrDCOs7HThaEpqYzMin/HNhT XgsKp7O5XbGhoraiR5jHAK+VTeQ8Gk41zMT/VWmd0meW6NAoarF7ZjtB X-Google-Smtp-Source: AGHT+IFquuJBX64hlJ2MLg+J0iLAniQr7mICH5zXP+87WSHm8LQLQ9ulgSozlW3bZ4wP4rgKf1k8aA== X-Received: by 2002:a05:6512:4028:b0:594:2d00:5ded with SMTP id 2adb3069b0e04-5942d0061a4mr1079117e87.36.1762170741643; Mon, 03 Nov 2025 03:52:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+bGxIfrQ1d1QI+ZAaK48ZgLJ5LdNoLw7YGVdH6GczobYw==" Received: by 2002:a05:6512:63d5:20b0:594:2bb1:82cc with SMTP id 2adb3069b0e04-5942bb1867dls131242e87.2.-pod-prod-05-eu; Mon, 03 Nov 2025 03:52:18 -0800 (PST) X-Received: by 2002:a05:6512:3b11:b0:592:f77d:88f7 with SMTP id 2adb3069b0e04-5941d57d514mr4709575e87.52.1762170738186; 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=j10WCUM+OM9JToup3Ic1uoL7bjptaaqs+C/lFZ0rjHXMpGiBGaGBWtPrdtR+BxxZJE R1TFbP3aGfF+ZBPW4R6Fczl7XNH30dsl++j1uG3ye01Fel3e54GnotNyaY8iQJzorC3B q1um5d3nmwuIPmDfpU+zoccRKLuJNCc/1HGnpDcoFLyxEveMGCeuMPaNF01OeNCbdDI8 8xmaG0H+p6e/CTNVC+uAcBRyNKn2y3RxD88Iv+uhOW553mrksPM6kRZHadO28zS73R6A qZaLcidbD1K69KQAcgykkHh+cdLL7/x/17TNbT+FPbn8ag/VP7xrfDIgB4kxwY3Je7mY S+VA== 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=Xykf8gyUUP5G/uRQQ77VoujZi1pgsuxHOrSCtT+bcrg=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=KhsbXFUSvdwfu8HNAWAFoowxxqry4wzlr6fUpcMtyDUlt/8i+//Oj/1xQOhghYA6Tz 51pf25SzXi7DlXEAKE10eB9cXXYR/V25Qy705lcPo6N5FzZL78/3qMF0On3bOG3CDwA4 McAVe3ALDERwIlu7YVGtNQSYG2zSXjtPzf3F0UBFinc8qocKZDl9mVOiA6AC5k/KJIRI HGRVTeoQBXPQeX/nxim31+1LO3HlgGeYQL4qicfYXOTBrg1TmWFwAkY0Vo8walFOCKd0 dZ+ud0PKKNpXMS1j6qHrfYvejnNjfxe2WEm7AXB6cfn/gBDgrPae1PBRDVw+FGW+cWMD iTWg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NmNLnCV3; spf=pass (google.com: domain of fm-294854-2025110311521887c5e0b29f0002075e-yz8yd1@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521887c5e0b29f0002075e-yz8YD1@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5941f3ba8bdsi279733e87.4.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-2025110311521887c5e0b29f0002075e-yz8yd1@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2025110311521887c5e0b29f0002075e for ; Mon, 03 Nov 2025 12:52:18 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH 15/27] optee-client: Migrate to a bbclass Date: Mon, 3 Nov 2025 12:52:03 +0100 Message-ID: <7166f8c5ac3d8bfe6209357a8ee7b4cd2979bde0.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=NmNLnCV3; spf=pass (google.com: domain of fm-294854-2025110311521887c5e0b29f0002075e-yz8yd1@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2025110311521887c5e0b29f0002075e-yz8YD1@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} | 3 +- .../optee-client/optee-client-custom.inc | 40 ++++--------------- 2 files changed, 8 insertions(+), 35 deletions(-) copy meta/{recipes-bsp/optee-client/optee-client-custom.inc => classes-recipe/optee-client.bbclass} (93%) diff --git a/meta/recipes-bsp/optee-client/optee-client-custom.inc b/meta/classes-recipe/optee-client.bbclass similarity index 93% copy from meta/recipes-bsp/optee-client/optee-client-custom.inc copy to meta/classes-recipe/optee-client.bbclass index 8a97af58..691ffafb 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" diff --git a/meta/recipes-bsp/optee-client/optee-client-custom.inc b/meta/recipes-bsp/optee-client/optee-client-custom.inc index 8a97af58..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" - -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