[PATCH 0/7] Replace debian/compat files by a build dependency to debhelper-compat

[Florian Bezdeka]

Hi all,

according to the Debian packaging guidelines and linting done during the
package build debian/compat files should be replaced by a build
dependency to the debhelper-compat package.

This series cleans that up for all recipes inside meta and meta-isar.
With that series applied no debian/compat files remain.

Build tested by building for the stm32mp15x machine which pulls in all
affected recipes.

Happy reviewing ;-)

Cc: Quirin Gylstorff <quirin.g...@siemens.com>

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---
Florian Bezdeka (7):
meta: uboot: Replace debian/compat by debhelper-compat
meta: trusted-firmware-a: Replace debian/compat by debhelper-compat
meta: optee-os: Replace debian/compat by debhelper-compat
meta: optee-ftpm: Replace debian/compat by debhelper-compat
meta: optee-client: Update debianization to allow compat level increase
meta: optee-client: Replace debian/compat by debhelper-compat
meta-isar: optee-examples: Replace debian/compat by debhelper-compat

.../recipes-bsp/optee-examples/files/debian/compat | 1 -
.../optee-examples/files/debian/control.tmpl | 2 +-
.../optee-examples-stm32mp15x_3.21.0.bb | 4 +-
meta/recipes-bsp/optee-client/files/debian/compat | 1 -
.../optee-client/files/debian/control.tmpl | 59 ++++++++++++++++++++--
.../optee-client/files/debian/libckteec0.install | 1 +
.../optee-client/files/debian/libseteec0.install | 1 +
.../files/debian/libteeacl0.1.0.install | 1 +
.../optee-client/files/debian/libteec1.install | 1 +
.../files/debian/optee-client-dev.install | 2 +
.../files/debian/tee-supplicant.install | 1 +
.../optee-client/optee-client-custom.inc | 7 +--
meta/recipes-bsp/optee-ftpm/files/debian/compat | 1 -
.../optee-ftpm/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/optee-ftpm/optee-ftpm.inc | 3 +-
meta/recipes-bsp/optee-os/files/debian/compat | 1 -
.../recipes-bsp/optee-os/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/optee-os/optee-os.inc | 4 +-
.../trusted-firmware-a/files/debian/compat | 1 -
.../trusted-firmware-a/files/debian/control.tmpl | 2 +-
.../trusted-firmware-a-custom.inc | 5 +-
meta/recipes-bsp/u-boot/files/debian/compat | 1 -
meta/recipes-bsp/u-boot/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/u-boot/u-boot-custom.inc | 4 +-
24 files changed, 83 insertions(+), 26 deletions(-)
---
base-commit: d46adc844a74ba55c4b9521b7d7da9b5a47b489e
change-id: 20250314-flo-remove-compat-files-20b23ddaf9e5

Best regards,
--
Florian Bezdeka <florian...@siemens.com>

[Florian Bezdeka]

According to
https://lintian.debian.org/tags/uses-debhelper-compat-file.html

compat files should be replaced by a build dependency to the

debhelper-compat virtual package.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

meta/recipes-bsp/u-boot/files/debian/compat | 1 -
meta/recipes-bsp/u-boot/files/debian/control.tmpl | 2 +-

meta/recipes-bsp/u-boot/u-boot-custom.inc | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/files/debian/compat b/meta/recipes-bsp/u-boot/files/debian/compat
deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000
--- a/meta/recipes-bsp/u-boot/files/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
index 9379be7daef683c561c0bfa43ae79ccc77781a83..006982c2eec8dc3ad63aabaeb23fa84e31127aa6 100644
--- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl
+++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl
@@ -2,7 +2,7 @@ Source: ${PN}
Section: admin
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: ${DEBIAN_BUILD_DEPENDS}
+Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
Maintainer: ISAR project <isar-...@googlegroups.com>

Package: u-boot-${MACHINE}
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index a7b6cb0bd2cf312aac5f329e0e5faab21550de95..2d6dd8e057f8a0385980d5c658121c94c9abe42d 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -1,7 +1,7 @@
# Custom U-Boot build
#
# This software is a part of ISAR.
-# Copyright (c) Siemens AG, 2018
+# Copyright (c) Siemens AG, 2018-2025
#
# SPDX-License-Identifier: MIT

@@ -26,7 +26,7 @@ U_BOOT_EXTRA_BUILDARGS ??= "BL31=${BL31} TEE=${TEE}"

TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN \
- U_BOOT_EXTRA_BUILDARGS"
+ U_BOOT_EXTRA_BUILDARGS DEBIAN_COMPAT"

U_BOOT_TOOLS_PACKAGE ?= "0"
U_BOOT_CONFIG_PACKAGE ?= "0"

--
2.48.1

[Florian Bezdeka]

According to
https://lintian.debian.org/tags/uses-debhelper-compat-file.html

compat files should be replaced by a build dependency to the

debhelper-compat virtual package.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

meta/recipes-bsp/trusted-firmware-a/files/debian/compat | 1 -
meta/recipes-bsp/trusted-firmware-a/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-bsp/trusted-firmware-a/files/debian/compat b/meta/recipes-bsp/trusted-firmware-a/files/debian/compat

deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000

--- a/meta/recipes-bsp/trusted-firmware-a/files/debian/compat

+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/meta/recipes-bsp/trusted-firmware-a/files/debian/control.tmpl b/meta/recipes-bsp/trusted-firmware-a/files/debian/control.tmpl
index 7ffd189d3a7b6f8a732c10cc020a3b5e911798bb..cf4607e3b409ac08dd94b64b4a37487be4f063c4 100644
--- a/meta/recipes-bsp/trusted-firmware-a/files/debian/control.tmpl
+++ b/meta/recipes-bsp/trusted-firmware-a/files/debian/control.tmpl

@@ -2,7 +2,7 @@ Source: ${PN}
Section: admin
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: ${DEBIAN_BUILD_DEPENDS}
+Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
Maintainer: ISAR project <isar-...@googlegroups.com>

Package: trusted-firmware-a-${TF_A_NAME}
diff --git a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
index def4be8d19dd05bdbc3e8f3acb08aeffd2fa07f3..9f143b13de4b3ea6f6db5de5a84a3c19555344d3 100644
--- a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
+++ b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
@@ -1,7 +1,7 @@
# Custom Trusted Firmware A build

#
# This software is a part of ISAR.

-# Copyright (c) Siemens AG, 2020
+# Copyright (c) Siemens AG, 2020-2025
#
# SPDX-License-Identifier: MIT

@@ -23,7 +23,8 @@ DEBIAN_BUILD_DEPENDS ?= ""
PROVIDES += "trusted-firmware-a-${TF_A_NAME}"

TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
-TEMPLATE_VARS += "TF_A_NAME DEBIAN_BUILD_DEPENDS TF_A_PLATFORM TF_A_EXTRA_BUILDARGS"
+TEMPLATE_VARS += "DEBIAN_COMPAT \
+ TF_A_NAME DEBIAN_BUILD_DEPENDS TF_A_PLATFORM TF_A_EXTRA_BUILDARGS"

do_prepare_build() {
cp -r ${WORKDIR}/debian ${S}/

--
2.48.1

[Florian Bezdeka]

According to
https://lintian.debian.org/tags/uses-debhelper-compat-file.html

compat files should be replaced by a build dependency to the

debhelper-compat virtual package.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

meta/recipes-bsp/optee-os/files/debian/compat | 1 -
meta/recipes-bsp/optee-os/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/optee-os/optee-os.inc | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-bsp/optee-os/files/debian/compat b/meta/recipes-bsp/optee-os/files/debian/compat

deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000

--- a/meta/recipes-bsp/optee-os/files/debian/compat

+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/meta/recipes-bsp/optee-os/files/debian/control.tmpl b/meta/recipes-bsp/optee-os/files/debian/control.tmpl
index fdf898e89320761b362b0520d3a5d8272c56c4ea..7bcd6edb75b4c62f8137136a237a38b10865db58 100644
--- a/meta/recipes-bsp/optee-os/files/debian/control.tmpl
+++ b/meta/recipes-bsp/optee-os/files/debian/control.tmpl

@@ -2,7 +2,7 @@ Source: ${PN}
Section: admin
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: ${DEBIAN_BUILD_DEPENDS}
+Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
Maintainer: ISAR project <isar-...@googlegroups.com>

Package: ${DEBIAN_PACKAGE_NAME}
diff --git a/meta/recipes-bsp/optee-os/optee-os.inc b/meta/recipes-bsp/optee-os/optee-os.inc
index d2c5cd935c5ca923a4cf086ce71c01117e2f8205..eac75ae8b4bc3034847202a2448b0212dcd7f515 100644
--- a/meta/recipes-bsp/optee-os/optee-os.inc
+++ b/meta/recipes-bsp/optee-os/optee-os.inc
@@ -1,7 +1,7 @@
# 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

@@ -23,7 +23,7 @@ DEBIAN_PACKAGE_NAME ?= "optee-os-${OPTEE_NAME}"
DEBIAN_BUILD_DEPENDS ?= "python3-pycryptodome:native, python3-pyelftools"

TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
-TEMPLATE_VARS += "DEBIAN_PACKAGE_NAME OPTEE_NAME DEBIAN_BUILD_DEPENDS OPTEE_PLATFORM OPTEE_EXTRA_BUILDARGS"
+TEMPLATE_VARS += "DEBIAN_COMPAT DEBIAN_PACKAGE_NAME OPTEE_NAME DEBIAN_BUILD_DEPENDS OPTEE_PLATFORM OPTEE_EXTRA_BUILDARGS"

# split strip platform flavor, if any, from the specified platform string
OPTEE_PLATFORM_BASE = "${@d.getVar('OPTEE_PLATFORM').split('-')[0]}"

--
2.48.1

[Florian Bezdeka]

According to
https://lintian.debian.org/tags/uses-debhelper-compat-file.html

compat files should be replaced by a build dependency to the

debhelper-compat virtual package.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

meta/recipes-bsp/optee-ftpm/files/debian/compat | 1 -
meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/optee-ftpm/optee-ftpm.inc | 3 ++-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-bsp/optee-ftpm/files/debian/compat b/meta/recipes-bsp/optee-ftpm/files/debian/compat

deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000

--- a/meta/recipes-bsp/optee-ftpm/files/debian/compat

+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl b/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl
index abab42eeb9a41a79fde12c12e19f7fffb8ac8942..e6af755444b59443eb039aab9fd1c12bba4e455a 100644
--- a/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl
+++ b/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Standards-Version: 3.9.6
Maintainer: Unknown maintainer <unk...@example.com>
-Build-Depends: debhelper (>= 10), ${DEBIAN_BUILD_DEPENDS}

+Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}

Package: ${PN}
Architecture: any
diff --git a/meta/recipes-bsp/optee-ftpm/optee-ftpm.inc b/meta/recipes-bsp/optee-ftpm/optee-ftpm.inc
index 5d07e38d518b4ec279996d4b2a79e6add96d733c..738b694a41742a636276660239084ab50d56ecbf 100644
--- a/meta/recipes-bsp/optee-ftpm/optee-ftpm.inc
+++ b/meta/recipes-bsp/optee-ftpm/optee-ftpm.inc
@@ -1,4 +1,4 @@
-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2023-2025
#
# Authors:
# Su Bao Cheng <baoch...@siemens.com>
@@ -29,6 +29,7 @@ OPTEE_FTPM_BUILD_ARGS_EXTRA ?= " "

TEMPLATE_FILES = "debian/rules.tmpl debian/control.tmpl"
TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS \
+ DEBIAN_COMPAT \
OPTEE_FTPM_BUILD_ARGS_EXTRA \
TA_CPU \
TA_DEV_KIT_DIR"

--
2.48.1

[Florian Bezdeka]

The existing debianization was quite minimalistic to get tee-supplicant
up and running. A couple of packaging failures came to light after the
debian/compat had been lifted to 13:

| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libckteec.so.0 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libckteec.so.0.1 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libckteec.so.0.1.0 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libseteec.so.0 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libseteec.so.0.1 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libseteec.so.0.1.0 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libteeacl.so.0 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libteeacl.so.0.1 exists in debian/tmp but is not installed to anywhere
| dh_missing: warning: usr/lib/arm-linux-gnueabihf/libteeacl.so.0.1.0 exists in debian/tmp but is not installed to anywhere
| dh_missing: error: missing files, aborting
| The following debhelper tools have reported what they installed (with files per package)
| * dh_install: libteec1 (3), optee-client-dev (15), tee-supplicant (1)
| * dh_installdocs: libteec1 (0), optee-client-dev (0), tee-supplicant (0)
| If the missing files are installed by another tool, please file a bug against it.
| When filing the report, if the tool is not part of debhelper itself, please reference the
| "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+).
| (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz)
| Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built
| If the omission is intentional or no other helper can take care of this consider adding the
| paths to debian/not-installed.
|
| Remember to be careful with paths containing "arm-linux-gnueabihf", where you might need to
| use a wildcard or (assuming compat 13+) e.g. ${DEB_HOST_MULTIARCH} in debian/not-installed
| to ensure it works on all architectures (see #961104).
| make: *** [debian/rules:13: binary] Error 25
| dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2

The debianization is now synchronized with upstream Debian 12,
additionally adding the libteeacl0.1.0 package to fix all remaining
reported packaging problems that upstream already fixed for
Debian 13 - where additional package renaming will take place.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

.../optee-client/files/debian/control.tmpl | 59 ++++++++++++++++++++--
.../optee-client/files/debian/libckteec0.install | 1 +
.../optee-client/files/debian/libseteec0.install | 1 +
.../files/debian/libteeacl0.1.0.install | 1 +
.../optee-client/files/debian/libteec1.install | 1 +
.../files/debian/optee-client-dev.install | 2 +
.../files/debian/tee-supplicant.install | 1 +

.../optee-client/optee-client-custom.inc | 5 +-
8 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-bsp/optee-client/files/debian/control.tmpl b/meta/recipes-bsp/optee-client/files/debian/control.tmpl
index 7cd121ee2f2796989348a73627224a9ab897056a..d3669d50627b3f88d475f38abebbd41070dd2b10 100644
--- a/meta/recipes-bsp/optee-client/files/debian/control.tmpl
+++ b/meta/recipes-bsp/optee-client/files/debian/control.tmpl
@@ -1,8 +1,13 @@
Source: ${PN}
Priority: optional
Maintainer: Unknown maintainer <unk...@example.com>
-Build-Depends: pkg-config, uuid-dev
-Standards-Version: 4.1.3
+Build-Depends: debhelper-compat (= 12),
+ docbook-xml,
+ docbook-xsl,
+ pkg-config,
+ uuid-dev,
+ xsltproc
+Standards-Version: 4.5.1
Section: libs
Homepage: https://github.com/OP-TEE/optee_client
Rules-Requires-Root: no
@@ -11,7 +16,10 @@ Package: optee-client-dev
Section: libdevel
Architecture: ${DISTRO_ARCH}
Multi-Arch: same
-Depends: libteec1 (= ${binary:Version}),
+Depends: libckteec0 (= ${binary:Version}),
+ libseteec0 (= ${binary:Version}),
+ libteeacl0.1.0 (= ${binary:Version}),
+ libteec1 (= ${binary:Version}),
${misc:Depends}
Description: normal world user space client APIs for OP-TEE (development)
OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
@@ -23,6 +31,21 @@ Description: normal world user space client APIs for OP-TEE (development)
.
This package contains the development files OpTEE Client API

+Package: libteeacl0.1.0
+Architecture: ${DISTRO_ARCH}
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: normal world user space client APIs for OP-TEE
+ OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
+ non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
+ technology. OP-TEE implements TEE Internal Core API v1.1.x which is the API
+ exposed to Trusted Applications and the TEE Client API v1.0, which is the
+ API describing how to communicate with a TEE. This package provides the TEE
+ Client API library.
+ .
+ This package contains libteeacl library.
+
+
Package: libteec1
Architecture: ${DISTRO_ARCH}
Multi-Arch: same
@@ -37,6 +60,36 @@ Description: normal world user space client APIs for OP-TEE
.
This package contains libteec library.

+Package: libckteec0
+Architecture: ${DISTRO_ARCH}
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: normal world user space client APIs for OP-TEE
+ OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
+ non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
+ technology. OP-TEE implements TEE Internal Core API v1.1.x which is the API
+ exposed to Trusted Applications and the TEE Client API v1.0, which is the
+ API describing how to communicate with a TEE. This package provides the TEE
+ Client API library.
+ .
+ This package contains libckteec library.
+
+Package: libseteec0
+Architecture: ${DISTRO_ARCH}
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: normal world user space client APIs for OP-TEE
+ OP-TEE is a Trusted Execution Environment (TEE) designed as companion to a
+ non-secure Linux kernel running on Arm; Cortex-A cores using the TrustZone
+ technology. OP-TEE implements TEE Internal Core API v1.1.x which is the API
+ exposed to Trusted Applications and the TEE Client API v1.0, which is the
+ API describing how to communicate with a TEE. This package provides the TEE
+ Client API library.
+ .
+ libseteec stands for secure element control.
+ .
+ This package contains libseteec library.
+
Package: tee-supplicant
Architecture: ${DISTRO_ARCH}
Depends: systemd ${misc:Depends}, procps, ${shlibs:Depends}
diff --git a/meta/recipes-bsp/optee-client/files/debian/libckteec0.install b/meta/recipes-bsp/optee-client/files/debian/libckteec0.install
new file mode 100644
index 0000000000000000000000000000000000000000..419ccf86c3f827fd6a5c4ce5c8f6d773129f3425
--- /dev/null
+++ b/meta/recipes-bsp/optee-client/files/debian/libckteec0.install
@@ -0,0 +1 @@
+usr/lib/*/libckteec*.so.*
diff --git a/meta/recipes-bsp/optee-client/files/debian/libseteec0.install b/meta/recipes-bsp/optee-client/files/debian/libseteec0.install
new file mode 100644
index 0000000000000000000000000000000000000000..3e8b56191392e8a550f822596c188742a0374155
--- /dev/null
+++ b/meta/recipes-bsp/optee-client/files/debian/libseteec0.install
@@ -0,0 +1 @@
+usr/lib/*/libseteec*.so.*
diff --git a/meta/recipes-bsp/optee-client/files/debian/libteeacl0.1.0.install b/meta/recipes-bsp/optee-client/files/debian/libteeacl0.1.0.install
new file mode 100644
index 0000000000000000000000000000000000000000..1542252de5637bb53a0946b52ec0de5669d4bd90
--- /dev/null
+++ b/meta/recipes-bsp/optee-client/files/debian/libteeacl0.1.0.install
@@ -0,0 +1 @@
+usr/lib/*/libteeacl*.so.*
diff --git a/meta/recipes-bsp/optee-client/files/debian/libteec1.install b/meta/recipes-bsp/optee-client/files/debian/libteec1.install
new file mode 100644
index 0000000000000000000000000000000000000000..3670ad0a682ff9dc0aabd1d5cf72c1038c1b224b
--- /dev/null
+++ b/meta/recipes-bsp/optee-client/files/debian/libteec1.install
@@ -0,0 +1 @@
+usr/lib/*/libteec*.so.*
diff --git a/meta/recipes-bsp/optee-client/files/debian/optee-client-dev.install b/meta/recipes-bsp/optee-client/files/debian/optee-client-dev.install
new file mode 100644
index 0000000000000000000000000000000000000000..f3800aad52cb869fee2b088da83d22e96bd27dbb
--- /dev/null
+++ b/meta/recipes-bsp/optee-client/files/debian/optee-client-dev.install
@@ -0,0 +1,2 @@
+usr/include/*
+usr/lib/*/lib*.so
diff --git a/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.install b/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.install
new file mode 100644
index 0000000000000000000000000000000000000000..05a96f1e64c0a99961a38643b0b4bb5a97d19dcc
--- /dev/null
+++ b/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.install
@@ -0,0 +1 @@
+/usr/sbin/*
diff --git a/meta/recipes-bsp/optee-client/optee-client-custom.inc b/meta/recipes-bsp/optee-client/optee-client-custom.inc
index f50ed007b17e6ce53477c9fa541e16335e35e814..a87863f90bd10f82c6e360288c97b00d83989c4c 100644
--- a/meta/recipes-bsp/optee-client/optee-client-custom.inc
+++ b/meta/recipes-bsp/optee-client/optee-client-custom.inc
@@ -1,5 +1,5 @@
#

-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2023-2025
#
# Authors:
# Su Bao Cheng <baoch...@siemens.com>

@@ -13,7 +13,8 @@ FILESPATH:append := ":${FILE_DIRNAME}/files"

DESCRIPTION = "OPTee Client"

-PROVIDES = "libteec1 optee-client-dev tee-supplicant"
+PROVIDES = "libteec1 libckteec0 libseteec0 libteeacl0.1.0"
+PROVIDES += "optee-client-dev tee-supplicant"

SRC_URI += "file://debian"


--
2.48.1

[Florian Bezdeka]

According to
https://lintian.debian.org/tags/uses-debhelper-compat-file.html

compat files should be replaced by a build dependency to the

debhelper-compat virtual package.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

meta/recipes-bsp/optee-client/files/debian/compat | 1 -
meta/recipes-bsp/optee-client/files/debian/control.tmpl | 2 +-
meta/recipes-bsp/optee-client/optee-client-custom.inc | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-bsp/optee-client/files/debian/compat b/meta/recipes-bsp/optee-client/files/debian/compat

deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000

--- a/meta/recipes-bsp/optee-client/files/debian/compat

+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/meta/recipes-bsp/optee-client/files/debian/control.tmpl b/meta/recipes-bsp/optee-client/files/debian/control.tmpl
index d3669d50627b3f88d475f38abebbd41070dd2b10..4cf11231ddf871d71c4ef665d71708fa31014f55 100644
--- a/meta/recipes-bsp/optee-client/files/debian/control.tmpl
+++ b/meta/recipes-bsp/optee-client/files/debian/control.tmpl
@@ -1,7 +1,7 @@

Source: ${PN}
Priority: optional
Maintainer: Unknown maintainer <unk...@example.com>

-Build-Depends: debhelper-compat (= 12),

+Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}),

docbook-xml,
docbook-xsl,
pkg-config,
diff --git a/meta/recipes-bsp/optee-client/optee-client-custom.inc b/meta/recipes-bsp/optee-client/optee-client-custom.inc
index a87863f90bd10f82c6e360288c97b00d83989c4c..8a97af584c63fd579d3ab76272294a7fd6e14a33 100644
--- a/meta/recipes-bsp/optee-client/optee-client-custom.inc
+++ b/meta/recipes-bsp/optee-client/optee-client-custom.inc
@@ -23,7 +23,7 @@ TEE_FS_PARENT_PATH ?= "/var/lib/optee-client/data/tee"
RPMB_EMU ?= "0"

TEMPLATE_FILES = "debian/rules.tmpl debian/control.tmpl"
-TEMPLATE_VARS += "TEE_FS_PARENT_PATH RPMB_EMU"
+TEMPLATE_VARS += "DEBIAN_COMPAT TEE_FS_PARENT_PATH RPMB_EMU"

do_prepare_build[cleandirs] += "${S}/debian"
do_prepare_build() {

--
2.48.1

[Florian Bezdeka]

According to
https://lintian.debian.org/tags/uses-debhelper-compat-file.html

compat files should be replaced by a build dependency to the

debhelper-compat virtual package.

Signed-off-by: Florian Bezdeka <florian...@siemens.com>
---

meta-isar/recipes-bsp/optee-examples/files/debian/compat | 1 -
meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl | 2 +-
.../recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-isar/recipes-bsp/optee-examples/files/debian/compat b/meta-isar/recipes-bsp/optee-examples/files/debian/compat

deleted file mode 100644
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..0000000000000000000000000000000000000000

--- a/meta-isar/recipes-bsp/optee-examples/files/debian/compat

+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl b/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
index b0e70399f24a61571a2820525b2681d0fa0200c6..85c9735f68be3895246b5c01c3838475bbcc1f79 100644
--- a/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
+++ b/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl

@@ -2,7 +2,7 @@ Source: ${PN}
Section: admin
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: ${DEBIAN_BUILD_DEPENDS}
+Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
Maintainer: ISAR project <isar-...@googlegroups.com>

Package: ${PN}-acipher-ta
diff --git a/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb b/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb
index 8614a17045b83e4f8bfaa3c837feb96a062f8f50..f734e6eba6cd642db120e5bddd9aeb80551c046b 100644
--- a/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb
+++ b/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb

@@ -1,5 +1,5 @@
#
-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2023-2025
#

# SPDX-License-Identifier: MIT
inherit dpkg
@@ -43,7 +43,7 @@ DEBIAN_BUILD_DEPENDS ?= " \
optee-os-tadevkit-${OPTEE_NAME}"

TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl"
-TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS OPTEE_PLATFORM TA_DEV_KIT_DIR"
+TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS OPTEE_PLATFORM TA_DEV_KIT_DIR DEBIAN_COMPAT"

[Uladzimir Bely]

On Fri, 2025-03-14 at 20:33 +0100, 'Florian Bezdeka' via isar-users
wrote:

Applied to next, thanks.

--
Best regards,
Uladzimir.