From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a2e:9a93:: with SMTP id p19mr2665204lji.77.1587659473885; Thu, 23 Apr 2020 09:31:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:107c:: with SMTP id y28ls1759816ljm.10.gmail; Thu, 23 Apr 2020 09:31:13 -0700 (PDT) X-Google-Smtp-Source: APiQypKi/OLq/odKG4OWzrAE5yTN4ZzELkSxsmqempH1tDledAuYDv6AX1Jj+3H4ZrPex9/H3fRz X-Received: by 2002:a05:651c:230:: with SMTP id z16mr2856870ljn.185.1587659473042; Thu, 23 Apr 2020 09:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587659473; cv=none; d=google.com; s=arc-20160816; b=pas3fAQwiuNibsArEiYWRf7QcEQcS4sADciIdtDOReES13GJKek/7jzgcJPSVPB3Gm ieTj08BAYVdD5krj34Na8WT2BFqn4YD3OosBQulx05ZqSgykC3RZc5P0dm/+5HVsPgtf ZI0D1c3pHblwWesA8n3ISV1ftv1qXYMpG0jDaFlqJcjw3FLIxEmsGHgcnnVbXJehPCTC 1JfWiXxmKLg+CN7WSUWzOc1gijFx3/Ej9jw25OkWS1dEwhNXnMncq2j0HstSd3vJCl6J z1Akxy/GpB9uVIQidIYvNfbVFnQaRhnqmGIt+msIhwkUqK1f/7E3eQnpIZI5x5ZqVJ4q 8B7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=+hyPosZJAssnDdKjj7fB0EQp0DXpPBuVl8+ROjeCLeU=; b=yI/mpIqJB1LEhlKsMMorsrat3BKme9QXQUi/mZk7lkNmv5X7mSJd3jYXsH6KyXd/lv K+KJCdiMMPmXbdvfoFjPofJiyxTXMoRphEl1TYOklxzjKtXaLmRSG9XTH15mrayXbLGV F6+DX0efM3gXuWw9xAx1aHuBk9o8Zfu8pFM5jsRg3eUD/cz4aoRd5p14bCdiGSOhxzXo /TmhT5A77N9Zc8Oa21qjQcH15FKfHgq7T2LE4yHF2GrQMtlLc0af16/eT+8+ZyutNq5r QfsLQpU1+9q+d3/L3U1LGOwLYUtH+iARYXouv5oIbFf/ggipxbkXsKFne7cXvCzLYhaV AN+g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id x145si167127lff.2.2020.04.23.09.31.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 09:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03NGVBfc024392 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 18:31:11 +0200 Received: from [139.22.135.18] ([139.22.135.18]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NGVAND023055; Thu, 23 Apr 2020 18:31:10 +0200 From: Jan Kiszka Subject: [PATCH v3] debianize: Add placeholder for original version to CHANGELOG_V To: isar-users Cc: Henning Schild Message-ID: Date: Thu, 23 Apr 2020 18:31:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: VfBXBEDU+3kU 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 -- 2.16.4