| Message ID | 20250314-flo-remove-compat-files-v1-1-fab2d8b18266@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | Replace debian/compat files by a build dependency to debhelper-compat | expand |
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-users@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"
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/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(-)