From patchwork Thu Feb 1 10:12:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3331 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 01 Feb 2024 11:12:46 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f185.google.com (mail-il1-f185.google.com [209.85.166.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 411ACiQE017831 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 1 Feb 2024 11:12:45 +0100 Received: by mail-il1-f185.google.com with SMTP id e9e14a558f8ab-3639649adcasf6577935ab.2 for ; Thu, 01 Feb 2024 02:12:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706782359; cv=pass; d=google.com; s=arc-20160816; b=lse/MPlpjbsTaRRwS6vzV2doyi9toPBjQDTlCAxFLFyDIVkbneoM0qaJpg2eraqGcY HpOJMRjPsYjMvNayShXDBtN127BUwah3l5UPmmJzhj71aNnLGEnSlURxTldnOqZjCHeA afo5B2otZEYJ9MBmC6dTHlLqzk+tP5X+nQ+1uivXGCwA7vBaa0fkrz6jGUKchzOjLxn6 INoUAqv5MvCF6zfDH0jSqPqVURLyaZzVANyCmX7Cs09oN+yxUVBPfJ7TwCrPKSQzXnV0 slGdohRve4bQjhXnSe8ITWVyBi0yUGpP6IkCaP3eOB+FVkBW1LkCobJEFs+q1GK6pqly lCiA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:to:from:dkim-signature; bh=9cMbpFZcx8ix7E4T07Eh5NeIwUpijqZDrnW6S7MNMbU=; fh=gRinZ/wig8V5QxQCwL1l2o8fkS0gRglyVeKuReyV9rI=; b=AE5YrGQJy5Lis5I66rL0pA0oKEnjuEjxZioYRgDhcxu0nTyYun1h7ERjhUzHnKf7r9 2ihuoKbX7L4mphXswHA6kZLm9yVpsPjpFkFuPDgzMlWmLxpTBssyWRLS3oozaUnS0INM URymW7NpvzYLov7BR3eGWkroe60pxq0gAHHcLgqJ/paohKMr7qCbAkjlt8q+Ku85Gocb qvvoQAihQQdsAxs+vYqPdZSsoAcpaqvsHYHyN3L+WhBSOCImhQbO/0DFebwTZfpLntcH QkABYM2k2r51P6/UT7mg89nkHtzs/Rf8Jhd1T1M9eTpgVfZS6PEdQ5hHveaLMM6y12Tj uw+A== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1706782359; x=1707387159; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=9cMbpFZcx8ix7E4T07Eh5NeIwUpijqZDrnW6S7MNMbU=; b=X8BiY4xKXgk5JbdFaX3KcpZpXdHs7qXZGgfagKVMC45bXi/XSX5t0qM6Tm8reniVL4 IpCaJR9vLx6ZXw3u0tigTQ9QEPUVw0+qE8exvVnHg4uahfAnVyJ6DjjHXHwbZTQmLC++ KTLm6DkJa5iUjqAwumMHCsCYw3N9DcQrbkyrMyJL8/jPDqDlEWUhWg3b45KwsMMxasAq Cge6Pa1FIkusGL1DW8xgm/cxZplExXu/xZgAeukJ1EfdcgoqsaS003NgN1/Op7dKU3rE dcPYChdsIXMbAyNwa5L7RfGxITP8eTdU3CXewd8NdYMclKKt6QyMe8PuvDM4NsiYwsQp YbOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706782359; x=1707387159; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9cMbpFZcx8ix7E4T07Eh5NeIwUpijqZDrnW6S7MNMbU=; b=pWiJK9B1KxWn2Fs07e7RbV3NueJWyGoGhVxARdiE74+SyelC0qDmnoK8wSAXGxSHEs UbIXpPj/sACtt7rqbISyMB607HL/nPxtotK8uLUItSvPOA1lpssuKqtTWh9HUVReAu6I txlCqCrPdgZDxg69P0ePL98+PJ9KGE5fHY+TA1lRZe6lX5EUbhLKBiIJlKEYindfaTQW 6vKCWaZ1tkTQFHCOEMT4Fo1CsECCYFWjYYS1qks61Lx/yGVp+nkrsm/kCEOpACwFb/aq m5L0vyyRyupvjzrekCNWUd7OJCmPGMtwk8jjeaA2ras3ln0rjdGHoW55gD/DNdk2YMhk DFIA== X-Gm-Message-State: AOJu0Yxz2Y0gKn8QoUZftQtLkehxjk8be6sDt7frCFrpDrTq1G2OwfGU W47Ixt1/Gyl9IYcyI7OpqycljnCh6Pex5tRif7ff4ztwT2Wo4dco X-Google-Smtp-Source: AGHT+IFXmCsU0AgZBR8LtejzUbi6JvHI/y0sy7eUa7/UUzlRjL7RyihacVPMwm/XNkQExuoPXTBXcA== X-Received: by 2002:a92:ddc8:0:b0:363:a5fc:7fb3 with SMTP id d8-20020a92ddc8000000b00363a5fc7fb3mr346180ilr.7.1706782359018; 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-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 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; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240201101236c59c64943ee1f953f3 for ; Thu, 01 Feb 2024 11:12:37 +0100 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-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 X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 Acked-by: Felix Moessbauer --- 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"