From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a19:992:: with SMTP id 140mr2817552lfj.41.1587655507954; Thu, 23 Apr 2020 08:25:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:86cf:: with SMTP id n15ls1729743ljj.11.gmail; Thu, 23 Apr 2020 08:25:07 -0700 (PDT) X-Google-Smtp-Source: APiQypLjjfHQyew2jlO4iIBaJbGp8/BJU5CEIFJM57yMmJqExyCDlsKg/Qp9KU4QBc/oO5Tznswv X-Received: by 2002:a2e:9d8c:: with SMTP id c12mr2783431ljj.67.1587655507142; Thu, 23 Apr 2020 08:25:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587655507; cv=none; d=google.com; s=arc-20160816; b=TakrOOqIBsey+/SLc2++SfcIfdgFpJpd0iSwKFfTODopu4MmHL0GsK0bi7Ha+OCj+z JZE5mVygkipN0UenLpnInYWxfXeZGxFQdOHNQRLZBch9YqHDIiLrEW748aAbbIjum/ux bdFxWA83J/3YMricxQj0+QS2WeEkoOHq1S/L3NahMylpHLHlWNOC/TgYD/n/Dzg313C0 d5jJCtLLVUPSSFf0tK59CddueNnrZ5ppQDEcsexpvDpWPDp/YZ71pjl808SLNEMW9fnu GaDB0azETSOzk5gNg1UMV9cE9WTeKalp1zFir2fFyRKu8mqrEAAFrUxchash6+wVATha CFDw== 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:to:subject:from; bh=84BMi4rUx0S9Qaz6KfPMq8K3d3Lo4pQ2pBmdf9WbwT4=; b=Ft5pH58aPnXKSfneCb0N+RkVvFEP5JoD97+termH2rCKp5M3MbOMWQkVkPyCfPfvtF pssA2HLG5Dlt95v9+so9T3uMi1cNZLT9WeEeoVLWXhgKrzBSj6BqWnlheipcJ+DylVJz 8SNU1NmIP6EYPSi1eM7plbC7OjoXoS2VOXI0q3kSQGl/yXp/KDGJh9/Cna5dTxT73qPM 5SV5RjZyyWqDFm+srwPEIuPUcMzo7E/NGeubhwMmLYqI5CgQ1oZkI+vZ5h2SS99e41jd 9C4Ej2IfnzBsDlnMsWB9l6kBsy257batPG49a8rJEBMAqXe6IG4en7oc3yJnUln1UO0J 3EwQ== 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 p5si177613ljj.3.2020.04.23.08.25.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 08:25:07 -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 03NFP6uv008955 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 17:25:06 +0200 Received: from [139.22.135.18] ([139.22.135.18]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NFP5KD028218; Thu, 23 Apr 2020 17:25:05 +0200 From: Jan Kiszka Subject: [PATCH v2] debianize: Add placeholder for original version to CHANGELOG_V To: isar-users , Henning Schild Message-ID: Date: Thu, 23 Apr 2020 17:25:05 +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: PD3+CCzR4esj 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 v2: - save and use original changelog for version placeholder - use -S on dpkg-parsechangelog meta/classes/debianize.bbclass | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index da43a4e2..eb64ebb9 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -11,6 +11,14 @@ DESCRIPTION ?= "must not be empty" MAINTAINER ?= "Unknown maintainer " deb_add_changelog() { + 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 +26,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 +34,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 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux