From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a2e:8813:: with SMTP id x19mr2778176ljh.83.1587654489704; Thu, 23 Apr 2020 08:08:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c310:: with SMTP id t16ls1359076lff.2.gmail; Thu, 23 Apr 2020 08:08:08 -0700 (PDT) X-Google-Smtp-Source: APiQypIUZi/epUG95bGKLJntI1uF824aFN3/L40FBEpTZfc969RlBLFP7cK/MoxQItsJa98XhULV X-Received: by 2002:a05:6512:d1:: with SMTP id c17mr2738649lfp.167.1587654488852; Thu, 23 Apr 2020 08:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587654488; cv=none; d=google.com; s=arc-20160816; b=rMYEFRqXj1omO7pSUs89Y4NWNG6DfAJL45d9Vyk7yMqSei8z7uZNSMmQYd9BNTDJ33 zMtQUz7fiFydYYcslbMvpHFwoXodzfCBOMB3ELzXB8HvAz1Mb9ARDMno4TQX8rS8Loh4 UMUlTlE5TuD+uP9c81gKzYWWMVaty8dO4VD87owfA+yuTSIC6EPC8Q6rvzqvJraOxHmk ovQSyJTYuW3RaYjwO/uYX+Qn7RQzf30Y3gwRcCd2xczMU0qcmRQFreaHdbsNx23SzXXD 1iC7Juhyh0VZMhcyiWXHw0bopilOa3Ur0C/1Ua1KYFL2a5zkocHJvPZFxxKVankDuOS7 ZcpQ== 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=fAwbcBED/FV/qIUk6o0hWrCKr0Vt+/l6klDl5BwxKLM=; b=ValpUQ4hS5geE+hHxR+NSMiM3JzhavRdNFeZU7He+TzGWzumbw2D4DNG15NrMxqWFF vMx9ae0mj4mQZHE0ad+Ho1Xysm1NLsartv4dW5NhZ6+0XctkU1e+lemGEQyLbH/GSCZD NAoy1CPA5LGYPMZynb9H9ckJ+xjvsalKnLUfMApYM6oqX1ZcG7Xl6noJyPtbZKX0RcMS S8+Optu0/RwK5fQ34U9dhD0qFngg/WKCFz3tuAehRKkzX6nvYTMno9lfFsqvv530ncu8 A6vL/kjRsFJXfSiVNaxrpl7ycERE5u6eGRPDQmTUvHEajNTR734Q3faNg/JAZ4WP3/gz bQXQ== 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 q24si227615ljg.4.2020.04.23.08.08.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 08:08:08 -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 03NF88uj030934 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 17:08:08 +0200 Received: from [139.22.135.18] ([139.22.135.18]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NF876U006304; Thu, 23 Apr 2020 17:08:07 +0200 Subject: Re: [PATCH] debianize: Add placeholder for original version to CHANGELOG_V To: Henning Schild Cc: isar-users References: <519bc1ac-721d-e2b2-d23d-92913deded39@siemens.com> <20200423164038.08f14f1f@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Thu, 23 Apr 2020 17:08:07 +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: <20200423164038.08f14f1f@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 6ijgZCZNKTYn On 23.04.20 16:40, Henning Schild wrote: > On Thu, 23 Apr 2020 15:54:47 +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 >> --- >> meta/classes/debianize.bbclass | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/meta/classes/debianize.bbclass >> b/meta/classes/debianize.bbclass index da43a4e2..d317caf6 100644 >> --- a/meta/classes/debianize.bbclass >> +++ b/meta/classes/debianize.bbclass >> @@ -11,6 +11,9 @@ DESCRIPTION ?= "must not be empty" >> MAINTAINER ?= "Unknown maintainer " >> >> deb_add_changelog() { >> + orig_version=$(dpkg-parsechangelog -l ${S}/debian/changelog >> | grep "Version:" | cut -d' ' -f2) > > -S Version, no grep no cut Ah! Was looking for that but missed it. > >> + changelog_v=$(echo "${CHANGELOG_V}" | sed >> 's//'${orig_version}'/') + >> 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 +21,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 +29,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})" >> then >> # entry for our version already there, use >> unmodified rm ${S}/debian/changelog > > I am afraid that calling this many times will create many entries with > ever longer unique versions. That is true. We need to preserve the original changelog_v, if any, and use that as reference for the check. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux