From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a17:906:459:: with SMTP id e25mr3488297eja.379.1587660430883; Thu, 23 Apr 2020 09:47:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d1ca:: with SMTP id g10ls2455894edp.6.gmail; Thu, 23 Apr 2020 09:47:10 -0700 (PDT) X-Google-Smtp-Source: APiQypKTcgVI9BH8yC+ZvMGuBswmhAqWNcXfeIO1Oq/qWsA1vnUgl7CieSwJTG+N0OR4qiVLYHJV X-Received: by 2002:aa7:d481:: with SMTP id b1mr3629599edr.226.1587660430325; Thu, 23 Apr 2020 09:47:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587660430; cv=none; d=google.com; s=arc-20160816; b=0p7lCzorVmzTVTbq/+SNszYMzuz7NVAeBUJadV4Tck1R+76XfBVNG/awtLrgffpoMQ aNX+5L8reSNUP5MJi4ks+Vk2k+tYy/OFt8AZb0UWrrhBWO+bPtXz7Fbh/mjlbYZUB394 kKi5jTkOpmQQl21ILM1tppoZ6xQSWQ2RzPVv1fKtWeMUwOJ4sE2e7WNRiWp8dZRwQQ8J 038ipSMD8VaCQursHjnfJwtBnCHJCMbAJMbFxzY+53hKfvRsFbU+EYjVIopDVOwtUn3B XkXLe4CbKsWMwrfyjYtu9pC5WJvKs9Y7FRLi4dhBYZJipzb14nA67RiUKSyzVw63Yn0+ bTjg== 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=EMh6ReeLqeNu5sKw7J9tMwDz4J06kV3dF9akYNF0sgw=; b=kCoJfAan2DKXWVxEcGnWdj24Ww6gS+LFD7nebY71uwfy+g1dIs2oaVoDVcmAiG12DK K9SPcHkVkDp0C/6OrK+2c0hd3V5zRBMUZW1ATSl3odBGM+/tw44hOCPmTNHN2XSa6mYB LEWVtK7xdg/KzxA6lUIJ/p8BJDOuJzDMV7gHF1sKSxkh3vkEkgkJ2QFTPmx6peqHldIS 1w6XESgNyCtgLuPotLz+Cszn6fSY0RwHByDgAi9ZHEh2bbQ4Gb1/MmHi5LQQTJOQdwGZ spNgi4oPL6Aia1aJjzFMQNN+AUxrcmxRTM6r11d0MruhxrcdRizAS345TFIasHubPn8V YNww== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id i2si164482edn.2.2020.04.23.09.47.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 09:47:10 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 03NGl9fI024495 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 18:47:09 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.46.0]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 03NGl9ZV032520; Thu, 23 Apr 2020 18:47:09 +0200 Date: Thu, 23 Apr 2020 18:47:08 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH v3] debianize: Add placeholder for original version to CHANGELOG_V Message-ID: <20200423184708.074ef245@md1za8fc.ad001.siemens.net> In-Reply-To: References: 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: csOUtiHIge5d This looks nice and clean, consider putting this into the hello rebuild example. Henning 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})" > then > # entry for our version already there, use > unmodified rm ${S}/debian/changelog