From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:aa7:c497:: with SMTP id m23mr2848568edq.155.1587652841239; Thu, 23 Apr 2020 07:40:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:2351:: with SMTP id m17ls2110976eja.8.gmail; Thu, 23 Apr 2020 07:40:40 -0700 (PDT) X-Google-Smtp-Source: APiQypLidTnurWbVGpSlGlJ6YYQsR65xYz8DRR2QRLiXCUe7cxbyvUpEU9T0y8mRIK7Id4e+d6yB X-Received: by 2002:a17:906:1303:: with SMTP id w3mr2870139ejb.275.1587652840690; Thu, 23 Apr 2020 07:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587652840; cv=none; d=google.com; s=arc-20160816; b=VDbnPnT348bt0igrYY2uD1Lbb/s2nGK8Hto/5kLy3ETuYdujw2xBj0RkHsH5yy+coH 6/L8BGsVXv66jBtd/dc1a2os8B0VkHvvdYjyn2ZdodBrefUti2NCN6hT7FR5GlQjiY/+ RYpDkCKw+borwnqcOvKWb/QIS4CuFKPKapiyKSXi+JU3tDveASjEjwwiXdXcTPNXsQJc RkeNm/3EP2Bo4rHIWt7xfF6SlDKyyLi5Uet3/vSsRbcBDza8+kupFi5pzeKe9oEitegj 0EBvgAMowAYUmvCVW5S5neGACUjZNEXQwxnYQ4EXQR8E/ODLFt6y79PBTTx5Q4ksQReT jD1w== 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=SinjSgVwY492BiPovdZTzSuJE/L5sVawIw9L6vaNd5E=; b=v6VlUERXLmnn3oaW6koxwu8TUWl10dHkWX6p2UD21ihQ8xnT4B5C23X1gsgnMltpTq U8FZ/Asq1kk5LYKrk7Yn+wFz2XbGnF/AUaD8nElRblC8nfPEjA24aoJ7eDuhSbDNxMlA fh8Ei1/vCPYRsHNdpGsQi8dJPuZhBYm4lS0sEWhFcuodq2TIXxDoXQxhCIQ0rE4vInNR Z4GxnIXhPmnVvinCYJ1IllxNj3FziWBZXM2WaKj/6ZQ3Hs1dNNsFgWwLspuXMRR+u1Vk 8vxLxHhmjY19+q0dWIFiBaQ9OejUJiDybnFw1HCPf4GoGB2l6yuMHWPkELURRFLYvFKq 2MuQ== 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 i2si141042edn.2.2020.04.23.07.40.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 07:40:40 -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 03NEee9T021840 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 16:40:40 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.46.0]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NEed9P025040; Thu, 23 Apr 2020 16:40:39 +0200 Date: Thu, 23 Apr 2020 16:40:38 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] debianize: Add placeholder for original version to CHANGELOG_V Message-ID: <20200423164038.08f14f1f@md1za8fc.ad001.siemens.net> In-Reply-To: <519bc1ac-721d-e2b2-d23d-92913deded39@siemens.com> References: <519bc1ac-721d-e2b2-d23d-92913deded39@siemens.com> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: o9LkWIewq/lD 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 > + 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. Henning