From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a2e:b012:: with SMTP id y18mr2884356ljk.238.1587660214816; Thu, 23 Apr 2020 09:43:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:86cf:: with SMTP id n15ls1788996ljj.11.gmail; Thu, 23 Apr 2020 09:43:34 -0700 (PDT) X-Google-Smtp-Source: APiQypKsQC7l+ltroLm2vP/lTbtbvjU4iWaJLKroBKMbDWmtDd67/Z85k2/ODlqHJRU/AuWzHxZ8 X-Received: by 2002:a2e:7d14:: with SMTP id y20mr2993642ljc.268.1587660214252; Thu, 23 Apr 2020 09:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587660214; cv=none; d=google.com; s=arc-20160816; b=MrEa8hFKnNMGN3FhPH8flZpqZnlqwa2tSzxsPYIsx8zbc7cbLAVxfkdmdr6/KXL2EP fXMYedXth9uxvWqIcmfL8Mdg29SW4hcs3t4inuq8JdXskDdH1qCrVJfu/HhSMxY54W2H 4a4BdwhozemQGNVCbGeS5g4hDt9O0tLluwTLJ6yG4JCRz4IroIAVyQL8ukqp34+NyPjf zzwgtWso1uPVuACwFoxwqxfbjICTaFeELYCzfa7BKOqGWXTKBMTjjoKpQiS+q3oWmCmb eX/yNxnNtAzScjLYS/C5Ux+fJi4d4PwsMFt8qX9tCGjm+XJDEA91P6QahaYUKA/Q7TMu qsog== 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=ZxoR9axw6AESZ8tWkYgSnmvTefhHDXQ0u5YbvJJB/W4=; b=RYJii85QunFSkxvmzIFUmnWkBBht0PMM7IwKNIAcRO2m81MOUc7e+qzynAN7NCrMcP ZyFcZbETinEy0Q2NBL7RhDpf8JDRUc9ALX+jaHlFFt89zO6AUa/5dRKzxK90/LObWGKL 4yF5kYst7jaicQXj+u5qJEsd+M4i0cY3t9fNc6qpEZ+83NMzk2u2j0x3WR8HqS60k3QE mf1bbz6CcAw6NZu5KwUhLq1ZkdyzqTr21aUpeFlF7R8J2KiZKqvrpQbB4cauTubtG5Q3 ScWkDUcAFemDi28qXhpYC4XW+ictWlzE9H31mhipbaarmKuPOgVIG7qu0PlwqBP+Mj4O HcWg== 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 q24si249966ljg.4.2020.04.23.09.43.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 09:43:34 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 03NGhXsC020513 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 18:43:33 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.46.0]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NGhWvd004733; Thu, 23 Apr 2020 18:43:32 +0200 Date: Thu, 23 Apr 2020 18:43:32 +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: <20200423184332.5f714d15@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: 0bnlI90CPpqR 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. Henning > then > # entry for our version already there, use > unmodified rm ${S}/debian/changelog