Re: [PATCH v2] debianize: use debhelper-compat to generate compat file

[Jan Kiszka <jan.kiszka@siemens.com>]

On 01.02.24 11:12, 'Quirin Gylstorff' via isar-users wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> debhelper supports the versions debhelper-compat (= 9) till
> debhelper-compat (= 13).
> 
> This patch also adds the variable `DEBIAN_COMPAT` to set the compat
> to the desired version.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  meta-isar/conf/distro/raspios-bullseye.conf |  2 ++
>  meta-isar/conf/distro/ubuntu-focal.conf     |  2 ++
>  meta-isar/conf/distro/ubuntu-jammy.conf     |  2 ++
>  meta/classes/debianize.bbclass              | 13 ++-----------
>  meta/conf/distro/debian-bookworm.conf       |  2 ++
>  meta/conf/distro/debian-bullseye.conf       |  2 ++
>  meta/conf/distro/debian-buster.conf         |  2 ++
>  meta/conf/distro/debian-sid-ports.conf      |  2 ++
>  meta/conf/distro/debian-sid.conf            |  2 ++
>  9 files changed, 18 insertions(+), 11 deletions(-)
> 
> diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf/distro/raspios-bullseye.conf
> index cc64a015..2515f0fd 100644
> --- a/meta-isar/conf/distro/raspios-bullseye.conf
> +++ b/meta-isar/conf/distro/raspios-bullseye.conf
> @@ -25,3 +25,5 @@ THIRD_PARTY_APT_KEYS += "http://archive.raspberrypi.org/debian/raspberrypi.gpg.k
>  COMPAT_DISTRO_ARCH:arm64 = "armhf"
>  
>  DISTRO_GCC = "10"
> +
> +DEBIAN_COMPAT = "13"
> diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
> index 7b400bc7..81728dec 100644
> --- a/meta-isar/conf/distro/ubuntu-focal.conf
> +++ b/meta-isar/conf/distro/ubuntu-focal.conf
> @@ -8,3 +8,5 @@ require conf/distro/ubuntu-common.inc
>  BASE_DISTRO_CODENAME = "focal"
>  
>  DISTRO_GCC = "9"
> +
> +DEBIAN_COMPAT = "12"
> diff --git a/meta-isar/conf/distro/ubuntu-jammy.conf b/meta-isar/conf/distro/ubuntu-jammy.conf
> index ce6ae511..afc4a731 100644
> --- a/meta-isar/conf/distro/ubuntu-jammy.conf
> +++ b/meta-isar/conf/distro/ubuntu-jammy.conf
> @@ -8,3 +8,5 @@ require conf/distro/ubuntu-common.inc
>  BASE_DISTRO_CODENAME = "jammy"
>  
>  DISTRO_GCC = "11"
> +
> +DEBIAN_COMPAT = "13"
> diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
> index 16f3638d..7de98673 100644
> --- a/meta/classes/debianize.bbclass
> +++ b/meta/classes/debianize.bbclass
> @@ -10,6 +10,7 @@ DEBIAN_BUILD_DEPENDS ??= ""
>  DEBIAN_DEPENDS ??= ""
>  DEBIAN_CONFLICTS ??= ""
>  DEBIAN_MULTI_ARCH ??= "no"
> +DEBIAN_COMPAT ??= "10"
>  DESCRIPTION ??= "must not be empty"
>  MAINTAINER ??= "Unknown maintainer <unknown@example.com>"
>  
> @@ -60,19 +61,15 @@ EOF
>  	fi
>  }
>  
> -deb_create_compat() {
> -	echo 10 > ${S}/debian/compat
> -}

Surprise, surprise: This is a recipe API change that can break users 
[1]! Please document.

Jan

[1] https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/1f1af2a6a6db78c2b3363b90a920526129269d19/recipes-core/ltp/ltp.inc#L23

-- 
Siemens AG, Technology
Linux Expert Center