From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6984413013347401728 X-Received: by 2002:a19:ac45:: with SMTP id r5mr4874529lfc.484.1626211361510; Tue, 13 Jul 2021 14:22:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1a7:: with SMTP id c7ls76149ljn.5.gmail; Tue, 13 Jul 2021 14:22:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYFByxKPzCnuQBLit+t3+4XZgrlh8XGjPDb4vs8oBCjshZ5RRnBGMxDvO57utu9Cq7tQ37 X-Received: by 2002:a2e:9e05:: with SMTP id e5mr5990270ljk.141.1626211360466; Tue, 13 Jul 2021 14:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626211360; cv=none; d=google.com; s=arc-20160816; b=YquMXh7DtXP9d689wy8+qYZ7QGEooutBdgPuTaDNourZas68RgPf4ejYUqwVlOAlSs VqnHNXX1V2enZxTxzqowLvovxlxrZoqNVmf+lHqE+WmBCgooIdoqT2A4kvFiDY6qnraU ltXRi5hia31tQxekJHv8+o8jQLdil7xxNOm4FjBC4qzcdO0S3ycP6YogQJQxtpUuK5Tt dStSlElvkl0l25IDSPzfxlnpJkRUfdfB5v3uwrYQDQ8p008Xl7wOy5Awr9n9rf4DBncS Vc1L6GjRhIN3tCu6bGK0NSv1OPcbO7E4/k91CprlPuByUQxEISL68+Ft7GAuq27N37ta i5Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=qahQbflAIHM8bw4bG/ergAaKyLHBOc6our6eHpD5UPk=; b=rBbSCNJJdApUdavux6bZEuSWECQOfzTtfM8aKVhQLL0284yz4BUVchpb/taUGvvYlu XA3n7VzjCcIhtRq2dRoLLkIF+sJrTsxE7MUmd89zpQdGpAKFBwpvghBy6Idm/UUr7YhC G56aACoucMuVqedQ4mfjLhOzOFthIysz7xlL6HD3wwyvU0p0jk2KVzSvRVUvv/M+zNyH s7UBrsNASRtcrsshmBXT6Cg/NJ8sVH55098jyymJ4hFcGr8s462FhJs6TEE7kA1QwCau b6t4ryZ62LwIUZIQrB3eKrztG9LB4tE1I/jHrZcXTZQopl9a8SGGHClJctAdlUuYAY9L P9JQ== 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 h20si3045lfv.7.2021.07.13.14.22.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jul 2021 14:22:40 -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 16DLMdtu003617 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Jul 2021 23:22:39 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.33.0]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16DLMdRR022514; Tue, 13 Jul 2021 23:22:39 +0200 Date: Tue, 13 Jul 2021 23:22:38 +0200 From: Henning Schild To: Cc: Adriaan Schmidt Subject: Re: [PATCH] meta/debianize: do not create compat file when new style is in control Message-ID: <20210713232238.2bf00ff2@md1za8fc.ad001.siemens.net> In-Reply-To: <20210713140933.16216-1-henning.schild@siemens.com> References: <20210713140933.16216-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: N3/PI1q/UhJx Am Tue, 13 Jul 2021 16:09:33 +0200 schrieb Henning Schild : > 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 In fact we would also need to look for that in DEBIAN_BUILD_DEPENDS will send a v2. Henning > + deb_create_compat > + fi > fi > # create the control-file if there is no control-file in > WORKDIR if [ -f ${WORKDIR}/control ]; then