diff mbox series

[3/7] meta: optee-os: Replace debian/compat by debhelper-compat

Message ID 20250314-flo-remove-compat-files-v1-3-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/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 mbox series

Patch

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-users@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]}"