From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6984413013347401728 X-Received: by 2002:a2e:b54d:: with SMTP id a13mr3892067ljn.388.1626261731988; Wed, 14 Jul 2021 04:22:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1799:: with SMTP id bn25ls492782ljb.3.gmail; Wed, 14 Jul 2021 04:22:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr0LryWgVTOvgthNoXru/1R2luP6GgWDZRqjJUUZqq4v2u4Q1ynmjTsTbY1oPdrw9OfFBl X-Received: by 2002:a2e:750c:: with SMTP id q12mr5644574ljc.440.1626261730966; Wed, 14 Jul 2021 04:22:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626261730; cv=none; d=google.com; s=arc-20160816; b=SaLYhXqxhpUn4RMueenMSLkQ855W8LYr34qvngwddaqG1WeUYzH10YUpijjUUFTbCY o7x18lFzR6W9FWDxWUyTZrw2FJUrN4yMTbCfJify5vgyGYwdjM8ErfC1PXjBevr5uODX QYFXZOlf02I99AWSqRSuHOM0tkfUOkZW3zGULNKD7+eaySLYxdnZMo/G9Oc1PMxsLULG iQabBQPxPYZ2ZYl4rlu0vjTO8rr6qg4C5y63kG4p9R3jwwcg5zcLoGE6lacDIYwa3t9O /zmHuCQ2Y8CzTe5O1uaX1M6f/fcCDJNjnpBG7kuCIHOTLpVh6dlkM0c8CDyuAuBJSqij Mhow== 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=lNx/vtpx5HIedfC55QoPREeXhXZ4vG4THcOHI34FrOw=; b=CHSdTEHIJSjEPk9t5wX7xf18FPIlCR8FPTeTjbgZuaPG096+iCmArxKD5L9H9oGNHG TfDuXaUUzMQkdRVGef9IR3j3IxybGoxWvgeRdr8U1F/5/+6j7zGdowtzMZ0eMYg4qUmW sW2kJYgKacCCJNGw/9yGo5yAnbrgiLLIt0ELQZppx8PUofPPnHrLelHQIa18SvXjU+5u 3Wxho+0rIYJ2OLf4014+NxIhEAbrfNICbWI0MUMpevTFFBr64N3C/qDeBVuBZol9GsK7 3M5I2j843/ydQdrpZQun+j+G8ATcUdbzbHlSys/gvomaiLVEHntp8Ng+7zW0Vt4ERkDT KK0Q== 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 u17si96963ljg.6.2021.07.14.04.22.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jul 2021 04:22:10 -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 16EBMA12011091 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 Jul 2021 13:22:10 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.120]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16EBM9rP025582; Wed, 14 Jul 2021 13:22:09 +0200 Date: Wed, 14 Jul 2021 13:22:08 +0200 From: Henning Schild To: Jan Kiszka Cc: , Adriaan Schmidt Subject: Re: [PATCH] meta/debianize: do not create compat file when new style is in control Message-ID: <20210714132208.4fa235b1@md1za8fc.ad001.siemens.net> In-Reply-To: <2a7fa56c-192d-6a5c-8f44-5e9adcd5ba95@siemens.com> References: <20210713140933.16216-1-henning.schild@siemens.com> <20210713232238.2bf00ff2@md1za8fc.ad001.siemens.net> <2a7fa56c-192d-6a5c-8f44-5e9adcd5ba95@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: qmpJ+xbbJ9pg Am Wed, 14 Jul 2021 08:43:17 +0200 schrieb Jan Kiszka : > On 13.07.21 23:22, Henning Schild wrote: > > 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 > > > > Maybe just reorder so that DEBIAN_BUILD_DEPENDS is already merged > into a generated control file. There is kind of cyclic dependency here. When using the compat file its content needs to go into the generator of the control file. In fact i found that the control file generator would also need to react on DEBIAN_BUILD_DEPENDS ... not including "debhelper (>= compat)" when "debhelper-compat (= compat)" is there. I am getting the feeling that he corner-case i wanted to address is better left open. "deb_debianize" is giving people a scaffold and does not, can not, fully automate the task of debianization. Especially when parts come in as static bits that it should integrate. It does a good enough job on that end, and taking care of such corner cases will probably cause more issues than it would solve. So i would say ... do not merge. Unless anyone else sees value to continue here. Henning > Jan > > > 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 > > >