[2/7] meta: trusted-firmware-a: Replace debian/compat by debhelper-compat

Message ID 20250314-flo-remove-compat-files-v1-2-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/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(-)

Patch

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-users@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}/