From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a1c:e444:: with SMTP id b65mr5333905wmh.6.1587660656691; Thu, 23 Apr 2020 09:50:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:7d12:: with SMTP id y18ls1232717wmc.2.gmail; Thu, 23 Apr 2020 09:50:56 -0700 (PDT) X-Google-Smtp-Source: APiQypLY81c2WLYwzwI9icZgSbZKbRT9LDqB6a6iWM/b/9OmKR89EMj08vppYZ3YtUv74UDOqDTk X-Received: by 2002:a7b:cbc6:: with SMTP id n6mr5399694wmi.155.1587660656083; Thu, 23 Apr 2020 09:50:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587660656; cv=none; d=google.com; s=arc-20160816; b=M7h77zCsOlVgYgQ67YD9fFiHDVD6t+3s6wIc6mcJ62EqYx+a5R+2sDUKVEH63xitOb 4SaqFYyUpiuw32+1nHE8aY9fVgilimQC6IsjHLO7juhaJPZq+dGozFXoKiAd2ZYteuiB IZHjfm+FIkWd0mHRPjgXLqoFayxOmCDJ0f/0DRs9sjHxoKLAuniSC4Mklx9bVISIA4KY RGgG34NXXd2j55gTxuaHwL1k7SnEEoNjcLjoYUHkMXhECRLXxJ8TQt8pbjUk7P5pjbhT jeyjJYpJblaLuPJqo6Dstb82fN0SY/eC007LVrASQLZSFFS5GeE1YnXdufRcwRiR1byG zDxQ== 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=wUT3DVNr18BNUAp51h2F9bLoEGR2b5gkvX+Zpnay26A=; b=03sJuS6gytzPcpWgi0hFUVG5rK5ywGLBMv7DT7r/c+QKc0vmByDWPvetCfen59niky Bjt2ZrzLtn8+6h2s+wOpC5V8NRnkivmHKpvAMa2QNqMhs0wrFxZmb/Ga7hQex+yd6e8B mb7yrEjoNIDFpiEmFiksIHjUBjRJf+gmuo62camCa35GfGwKCQMqMk4RRIkegcZL34wk oK8vOUGVeoO/SvI4VoQCIaO8aQ1QdACmZ0lq0IYlOFZ3EROVYnXwP5lTXAMnwYVb2L+0 8Hcs+TOwnVKMBM0VSf45MZwp9SETggBN3nnMZ0wvDDrmzCwwKlKrYIGSWYdUc1BQqPUb NGLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y1si186755wrh.1.2020.04.23.09.50.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 09:50:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 03NGosSZ028323 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 18:50:54 +0200 Received: from [139.22.135.18] ([139.22.135.18]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NGor03013262; Thu, 23 Apr 2020 18:50: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> From: Jan Kiszka Message-ID: <080b69c9-f654-f712-3f94-838ce77e9bdd@siemens.com> Date: Thu, 23 Apr 2020 18:50:54 +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: <20200423184332.5f714d15@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: OSoA4MVXxrVz 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. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux