From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a2e:87d0:: with SMTP id v16mr4904523ljj.137.1587715196268; Fri, 24 Apr 2020 00:59:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8086:: with SMTP id i6ls2622273ljg.8.gmail; Fri, 24 Apr 2020 00:59:55 -0700 (PDT) X-Google-Smtp-Source: APiQypJY2WwbFOGdrpd6itKT5XuTSbDq/Ev2r3U4e/FXpHB9mcvR73q2ciB9+r/4woHhoXUHJ0zB X-Received: by 2002:a2e:731a:: with SMTP id o26mr5187515ljc.189.1587715195468; Fri, 24 Apr 2020 00:59:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587715195; cv=none; d=google.com; s=arc-20160816; b=T7IkxwdbaupqPU6MLFckI9NINgZshs8FuqKqpHYgU5fVxjnqERul0+k8CCA2/Co17r NI7tX/8HSEQJqvuR+zj3Kz7Y738ZyAJiHTt7ByLUC63Da+az80kytJMCuriNl0PPVIaZ Ssf4UnBckWaxv7IaVNrITbSQ+tYX+HuR4LlskMZSgljgs5km0flY3j33H511NuKz3dvo BBoRCabxn57xl60TOaP6F5raxAJ4/Lc8/dchMfuiTguQLfCgbnm6dGn7sKrFpr1Me3gL SzoIyE9SC4WhewEaOexxPu8d37G94Kyb/4Vmof370t/O21/so9VOwskF0z8o8yqmvpvr Oudw== 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=7wdwPqJ2r7fEKMzzDQqhPno9fDQTbvWXfaL+mzBHJtc=; b=xFGl+pGNOGP9ayhJxW6Cza0j6l7mREiJc1oUSlzFIa3Xy2OyqzTwCccqCOPbVyc5Jv lIL/BqkDMoBWxA017DJ1rLE1amPKZAGNc6th+ltXDGS66S90s9tOkF/zUDA4ecaT+5sj BDo/xh7BRpW5u/1pURYHn52GWz067ySDp34HVsmWS4iEi2Jv2ol/4V+m/249PL0jXLtE o96qqe16l1RFYahOAAjWbSnGHhRk3zXQ+qXbgLTXuMtQm82W162ZiFThktMhoVnn+2vX 91+3FFtpp+hbtuAQ3Q+53gynr/DJo8yH363W9EDMxsZaPXniu6zJeXu5ZvbJ6hNH/ZR4 thwg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id p5si294047ljj.3.2020.04.24.00.59.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2020 00:59:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 03O7xsEH017877 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 24 Apr 2020 09:59:54 +0200 Received: from [139.22.114.128] ([139.22.114.128]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03O7xrmT031771; Fri, 24 Apr 2020 09:59:54 +0200 Subject: Re: [PATCH v3] debianize: Add placeholder for original version to CHANGELOG_V To: Henning Schild Cc: isar-users References: <20200423184332.5f714d15@md1za8fc.ad001.siemens.net> <080b69c9-f654-f712-3f94-838ce77e9bdd@siemens.com> <20200423193240.64dd1628@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <3beec9eb-783c-3588-86ec-1244f3b50f91@siemens.com> Date: Fri, 24 Apr 2020 09:59:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200423193240.64dd1628@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: cdgNKF3uFI6k On 23.04.20 19:32, Henning Schild wrote: > On Thu, 23 Apr 2020 18:50:54 +0200 > Jan Kiszka wrote: > >> On 23.04.20 18:43, Henning Schild wrote: >>> On Thu, 23 Apr 2020 18:31:10 +0200 >>> Jan Kiszka wrote: >>> >>>> From: Jan Kiszka >>>> >>>> This allows to append to the latest upstream version when using an >>>> unpinned source version. The format of the placeholder is >>>> "". >>>> >>>> Signed-off-by: Jan Kiszka >>>> --- >>>> >>>> Changes in v3: >>>> - fix regression when placeholder was not used >>>> >>>> meta/classes/debianize.bbclass | 13 +++++++++++-- >>>> 1 file changed, 11 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/meta/classes/debianize.bbclass >>>> b/meta/classes/debianize.bbclass index da43a4e2..e77be232 100644 >>>> --- a/meta/classes/debianize.bbclass >>>> +++ b/meta/classes/debianize.bbclass >>>> @@ -11,6 +11,15 @@ DESCRIPTION ?= "must not be empty" >>>> MAINTAINER ?= "Unknown maintainer " >>>> >>>> deb_add_changelog() { >>>> + changelog_v="${CHANGELOG_V}" >>>> + if [ -f ${S}/debian/changelog ]; then >>>> + if [ ! -f ${WORKDIR}/changelog.orig ]; then >>>> + cp ${S}/debian/changelog >>>> ${WORKDIR}/changelog.orig >>>> + fi >>>> + orig_version=$(dpkg-parsechangelog -l >>>> ${WORKDIR}/changelog.orig -S Version) >>>> + changelog_v=$(echo "${changelog_v}" | sed >>>> 's//'${orig_version}'/') >>>> + fi >>>> + >>>> timestamp=$(find ${S}/ -type f -not -path "${S}/debian/*" >>>> -printf "%T@\n"|sort -n -r|head -n 1) if [ -n "${timestamp}" ]; >>>> then date=$(LANG=C date -R -d @${timestamp}) >>>> @@ -18,7 +27,7 @@ deb_add_changelog() { >>>> date=$(LANG=C date -R) >>>> fi >>>> cat < ${S}/debian/changelog >>>> -${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low >>>> +${PN} (${changelog_v}) UNRELEASED; urgency=low >>>> >>>> * generated by Isar >>>> >>>> @@ -26,7 +35,7 @@ ${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low >>>> EOF >>>> if [ -f ${WORKDIR}/changelog ]; then >>>> if head -1 "${WORKDIR}"/changelog | \ >>>> - grep -q -e "^${PN} (${CHANGELOG_V})" >>>> + grep -q -e "^${PN} (${changelog_v})" >>> >>> Might want to switch to dpkg-parsechangelog while at it. >>> >> >> Should that still match both PN and the version? Would actually >> become more complex, though conceptually cleaner. > > Good catch, i think the PN was just in there because i decided to > "parse" myself. Prepending a changelog entry with another PN would be > pretty broken. > > What i cared about here was "only" the case where someone already > created an entry with that PV, maybe because they wanted a nicer > "commit message", another author, prio, date ... > > If we wanted to double-check, other places would need to do that as > well. I would drop it and wait for the first "fool" to change PN during > a rebuild. > OK. I will write a cleanup patch for that aspect on top of this one. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux