From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7330297939706773504 X-Received: by 2002:a92:d48b:0:b0:363:7d59:91aa with SMTP id p11-20020a92d48b000000b003637d5991aamr3985105ilg.30.1706782359148; Thu, 01 Feb 2024 02:12:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:3042:b0:363:93da:bf28 with SMTP id be2-20020a056e02304200b0036393dabf28ls415596ilb.0.-pod-prod-08-us; Thu, 01 Feb 2024 02:12:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEx1LFvdmgv3yDeVV0okfSqB7tPpNo9ixT3u5mtJU3k9QnVm3Cykiv3G097Z8LE5yIpKz0j X-Received: by 2002:a05:6e02:106c:b0:363:9d20:c192 with SMTP id q12-20020a056e02106c00b003639d20c192mr2903532ilj.6.1706782358369; Thu, 01 Feb 2024 02:12:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706782358; cv=none; d=google.com; s=arc-20160816; b=LL7LaOpVHLLT40F2z5HL7cdSDhchCreshCww1nBXQzS0hK1JjD4/Tw00t/B17e/vBg 2L22xqXbKMCTQRTP6t0adfSKuay/zD9AgJ1Vx99o554nZHivfS0yIozL0QO76ci1XEZk GkQ/QY3K1e2YSngP1EacfmYlSWLFonfdm6vV6tDJ1ZB4T9LNG+guyWCFCKBJsm4kCkKI e+m07sfieBg/FzR8DTWELqHqe/sFSHN3+uBZGz/BFTs8biYz5gSVs3K6dC91gcxa7yE4 +2DGrIAmHVyxXh4DP47rJ5wEHD7zejqgctfWjDQ4bJoYgYP2K6vciqCEX/GMZVL5bx7X rOjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:to:from:dkim-signature; bh=IsnCHuNqITm9FWUKXdOnKUhq+Wj0oijVNdCuWzj5RKI=; fh=gRinZ/wig8V5QxQCwL1l2o8fkS0gRglyVeKuReyV9rI=; b=ouyBEXw+jxVQ/AMhnhgIzNgayFYgdRsGVvPs27lqsaMuu7hX31DSypDepPdJBlnCbD JexvBXtFn9rjBx1n50CGUd2GTjG0eYvkMccT7yYoBm4GJLePe4ohK8BLAhuNZuhd8N7S x1DI1QTGZTEqktb6YCYJNmFhUnE3zjS5c2P6jpBK+eGPRJHahcEx4eXLoVF6yZJ78u8e LmuUC9/qYjMtXGw/7f2BgEen1P+DumlKNfk5pP5Z0kUoDQlYaDV9J/6p79Kha3gkh4xf 7sG4dI0JilS1WmjMFz7QTvTWxYK3Dlr1rwNRLxa7Oo78U5MUZT3S4vt7xfOEx6+WhaaA z9Pg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=TM35XiUY; spf=pass (google.com: domain of fm-51332-20240201101236c59c64943ee1f953f3-u7xwye@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-20240201101236c59c64943ee1f953f3-U7XwyE@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id h9-20020a926c09000000b00361a8692358si1153928ilc.2.2024.02.01.02.12.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2024 02:12:38 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-20240201101236c59c64943ee1f953f3-u7xwye@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=TM35XiUY; spf=pass (google.com: domain of fm-51332-20240201101236c59c64943ee1f953f3-u7xwye@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-20240201101236c59c64943ee1f953f3-U7XwyE@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240201101236c59c64943ee1f953f3 for ; Thu, 01 Feb 2024 11:12:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=IsnCHuNqITm9FWUKXdOnKUhq+Wj0oijVNdCuWzj5RKI=; b=TM35XiUYRAxlSLqWBeZjWfP0FnFF0vMvIKFN9lTJoTL5TuNZgAg3gt6Hya+IE5wuL/fJt6 zfVLZGIFs9jOJNaQ6DEi5ylquqjZVBxM8iPZ7K35uQmRovxpQ5ylWltq5jwEAlJdPzhLoVkC 2AmUIlMC3JG33VIzSeN3ka7xO0G/0=; From: Quirin Gylstorff To: isar-users@googlegroups.com, felix.moessbauer@siemens.com Subject: [PATCH v2] debianize: use debhelper-compat to generate compat file Date: Thu, 1 Feb 2024 11:12:05 +0100 Message-ID: <20240201101236.3555681-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: lRSsmlox9UVA From: Quirin Gylstorff 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 --- 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 " @@ -60,19 +61,15 @@ EOF fi } -deb_create_compat() { - echo 10 > ${S}/debian/compat -} deb_create_control() { - compat=$( cat ${S}/debian/compat ) cat << EOF > ${S}/debian/control Source: ${BPN} Section: misc Priority: optional Standards-Version: 3.9.6 Maintainer: ${MAINTAINER} -Build-Depends: debhelper (>= ${compat}), ${DEBIAN_BUILD_DEPENDS} +Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS} Package: ${BPN} Architecture: ${DPKG_ARCH} @@ -103,12 +100,6 @@ EOF deb_debianize() { install -m 755 -d ${S}/debian - # create the compat-file if there is no file with that name in WORKDIR - if [ -f ${WORKDIR}/compat ]; then - install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat - else - deb_create_compat - fi # create the control-file if there is no control-file in WORKDIR if [ -f ${WORKDIR}/control ]; then install -v -m 644 ${WORKDIR}/control ${S}/debian/control diff --git a/meta/conf/distro/debian-bookworm.conf b/meta/conf/distro/debian-bookworm.conf index d0599dc6..ce7279e3 100644 --- a/meta/conf/distro/debian-bookworm.conf +++ b/meta/conf/distro/debian-bookworm.conf @@ -15,3 +15,5 @@ DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 alpha-generic alpha-smp \ s390x sh7751r sh7785lcr sparc64-smp sparc64" DISTRO_GCC = "12" + +DEBIAN_COMPAT = "13" diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf index 9b76e68a..2cb9d20e 100644 --- a/meta/conf/distro/debian-bullseye.conf +++ b/meta/conf/distro/debian-bullseye.conf @@ -12,3 +12,5 @@ DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \ rt-686-pae rt-amd64 rt-arm64 rt-armmp" DISTRO_GCC = "10" + +DEBIAN_COMPAT = "13" diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf index 025fc936..57cfac33 100644 --- a/meta/conf/distro/debian-buster.conf +++ b/meta/conf/distro/debian-buster.conf @@ -12,3 +12,5 @@ DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \ rt-686-pae rt-amd64 rt-arm64 rt-armmp" DISTRO_GCC = "8" + +DEBIAN_COMPAT = "12" diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf index f045a3f2..64f3717e 100644 --- a/meta/conf/distro/debian-sid-ports.conf +++ b/meta/conf/distro/debian-sid-ports.conf @@ -25,3 +25,5 @@ THIRD_PARTY_APT_KEYS += "${DEBIAN_PORTS_KEYS}" IMAGE_PREINSTALL += "init" IMAGER_INSTALL:wic += "python3-distutils" + +DEBIAN_COMPAT = "13" diff --git a/meta/conf/distro/debian-sid.conf b/meta/conf/distro/debian-sid.conf index 631f9b5a..fdf9775c 100644 --- a/meta/conf/distro/debian-sid.conf +++ b/meta/conf/distro/debian-sid.conf @@ -19,3 +19,5 @@ DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 alpha-generic alpha-smp \ s390x sh7751r sh7785lcr sparc64-smp sparc64" DISTRO_GCC = "13" + +DEBIAN_COMPAT = "13" -- 2.43.0