[7/7] meta-isar: optee-examples: Replace debian/compat by debhelper-compat

Message ID 20250314-flo-remove-compat-files-v1-7-fab2d8b18266@siemens.com
State Accepted, archived
Headers show
Series Replace debian/compat files by a build dependency to debhelper-compat | expand

Commit Message

Florian Bezdeka March 14, 2025, 7:33 p.m. UTC
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.bezdeka@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(-)

Patch

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-users@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"
 
 do_prepare_build() {
     cp -r ${WORKDIR}/debian ${S}/