From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6984413013347401728 X-Received: by 2002:a19:e053:: with SMTP id g19mr3542135lfj.83.1626185377758; Tue, 13 Jul 2021 07:09:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7d17:: with SMTP id y23ls504364ljc.10.gmail; Tue, 13 Jul 2021 07:09:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwozlVpKGn/wd43bOXPjFNMhYzxbjrCFG4AXh6sYxHJmOAm3rJa2mJDzKsG65STHhIhT60y X-Received: by 2002:a2e:85d7:: with SMTP id h23mr4370231ljj.329.1626185376716; Tue, 13 Jul 2021 07:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626185376; cv=none; d=google.com; s=arc-20160816; b=P4FsE+PKuAjuY7CYbQnreluGTEvlDN+EJeRaqawWUZQexG/tooXJNaNZL9cXes5Am/ zonxGcM6/JUXt79no4uDwNHFrHHPgrceQNtgwAHG7w8qa7hLJte5H8L1xNuLL/G5mySR w80l4DAV21UIPTcuUlQ8vwDGPTnNAtU0bioTj1d8ruTtcPyLQ1wea44teATgXNUSQW4E RVjM01LdvVuXmgMbxOl6f6oSxTCqZ6imwp6girspdjjqnOKp/MSWA3T5U+/2/DAGm4n4 NCnaYV0NLDMK0JBb9Wt8wBJKauWA+7u9SJgvyW4IIx4rxd3J2QhU/HCTGpiHAxNj+DOf aJVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=6LNOAri/8ska/VaqwHZKsncZCiqAG5yDVkN07XWxzd4=; b=CxDUVY1WhpkcrbX/oFveRVzNjWJOLNGm0BIBtfN1k1jVNOH1Wy319KGMcSwlNN6/ad NiTnVP8Q1be5iQW0SfdOZWp3NZM1wHAWMEMtPyCrvG1zbT56mLsbs1Gn8skA0+3Rgk6f yRZqPO1YG90nCzO8RJnIL8Ft3n2nT4Ca3jYjNc6X7vNqfqpq2P1d9Us11TGQhwXLX8b7 t0K5UDOFn/EsWRs+p0ns994l4FE5TYSstlHXAjeTg8wD2ACLYJ0n9fBac9DNK6M0wekZ Dc4WTsF6lq8Fj0g9nWLO4z2cnot3M1bzrxWFGYPyHFKDf5ErLUgwG2eqBQMpujLMtHHP 0Sdw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id b12si627222lfb.9.2021.07.13.07.09.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jul 2021 07:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 16DE9Z5R030459 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Jul 2021 16:09:36 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.120]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16DE9ZFd031468; Tue, 13 Jul 2021 16:09:35 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild , Adriaan Schmidt Subject: [PATCH] meta/debianize: do not create compat file when new style is in control Date: Tue, 13 Jul 2021 16:09:33 +0200 Message-Id: <20210713140933.16216-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ZAl7UyH2ahgz The modern way to set the compat level is a Build-Depends on debhelper-compat, in which case a compat file must not exist. So if there is a control file using that new way, skip the creation of a compat file. Reported-by: Adriaan Schmidt Signed-off-by: Henning Schild --- meta/classes/debianize.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index dad1cb48fa40..878aaca89543 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -89,7 +89,11 @@ deb_debianize() { if [ -f ${WORKDIR}/compat ]; then install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat else - deb_create_compat + # new style compat level could be in control + # do not create a compat file in that case + if ! grep "debhelper-compat" ${WORKDIR}/control; then + deb_create_compat + fi fi # create the control-file if there is no control-file in WORKDIR if [ -f ${WORKDIR}/control ]; then -- 2.31.1