From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6984413013347401728 X-Received: by 2002:adf:9084:: with SMTP id i4mr10883877wri.23.1626244999824; Tue, 13 Jul 2021 23:43:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4c50:: with SMTP id n16ls1582643wrt.2.gmail; Tue, 13 Jul 2021 23:43:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeOriADjKxXGMp4PhnyeQj6MnrWXF/pOwFazVNkT7ACwSGJA2kbW7K0JdhIpOOE6r9EXOZ X-Received: by 2002:a5d:4402:: with SMTP id z2mr10487772wrq.44.1626244998869; Tue, 13 Jul 2021 23:43:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626244998; cv=none; d=google.com; s=arc-20160816; b=Dv+07AsGlzO5IIhI9fQN/uRjyq5zUjQjgrmWrmfuVdx60DIXyHpx3p7MTB2Pnz7/3X pL2ku1PAZtJy4ysvb+AojcYHFOlHn18KEAK3DOXgsj3ocQhYRmrhIr3yWedboFvEcLH7 XwgCVmaNCufIAKkmcw2MgiPpTyiWa151g2KL4NUKZFtewBb0VcProBGhZ+kVPc14WIHp mCEhWuqLkz/1Mi2EGZdZFZ0EI5c5MjtF0tkREcGPCcFLoJTZTQbT1+EwUMygr9UAVeey 6xzNA5nJFwMsHgqve9FjmtSV++b/H7l1p+l6N83XXLkfcj6MC+MMqcx7BYJaCEVVsjw1 p9qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=/nJ1prERnMgUY/cjj3qKpJzp+RFdKQ0ID/wiYaHkPa0=; b=rb44J7wY1ZrfwKbCDNaq1y5R5ewENiRReRZ7YMZW9QNY956rmOkxSN/hvwfxJYH1UZ Yp2LRJJpEa4hcMN7ehMXlxg8EUGKT6gm7H4NERKqgEgD1RhhO8szI1K/qQoj4/+xS6RB V7b5cMyC21m/2m8EqYGeMObLXIUqGNrf5KlR1TTTRtIhdA3IsfiaMrX45C9YwCKw+2s7 p+X0o9FtWPRGHKsON2qOpFwQA9bdZdhB1NCKlIEn00X5ZA7oRmhn29hXeQ23gOat9RYk hX8HeNvF7zGtNWJNI0EsQQjSiSAE64MegM6JtONmElz8FDkJRgkRA1IqHFyuBP5raBjg 3DKA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id k18si254593wmj.0.2021.07.13.23.43.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jul 2021 23:43:18 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 16E6hIsS015845 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 Jul 2021 08:43:18 +0200 Received: from [167.87.241.11] ([167.87.241.11]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16E6hIVu005114; Wed, 14 Jul 2021 08:43:18 +0200 Subject: Re: [PATCH] meta/debianize: do not create compat file when new style is in control To: Henning Schild , isar-users@googlegroups.com Cc: Adriaan Schmidt References: <20210713140933.16216-1-henning.schild@siemens.com> <20210713232238.2bf00ff2@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <2a7fa56c-192d-6a5c-8f44-5e9adcd5ba95@siemens.com> Date: Wed, 14 Jul 2021 08:43:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210713232238.2bf00ff2@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: KmVsgJLUa9tL 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. 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 > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux