From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:ac2:4187:: with SMTP id z7mr2514062lfh.113.1587650089407; Thu, 23 Apr 2020 06:54:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5186:: with SMTP id u6ls1266194lfi.5.gmail; Thu, 23 Apr 2020 06:54:48 -0700 (PDT) X-Google-Smtp-Source: APiQypKvycsVKVA67PIvt2/SljPVHsyFe7UtOf0Gg/AL6Ry9MUgl8R9UwBf0bcD0DzLM4Zm03s8o X-Received: by 2002:ac2:46f9:: with SMTP id q25mr2533693lfo.149.1587650088561; Thu, 23 Apr 2020 06:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587650088; cv=none; d=google.com; s=arc-20160816; b=RZOrcbTY42FDB0WEfz7xYkD3rJPXC+i08Nzeq1ul28uBezJIrWdQQVvk6aMjlqHdHg SG5rgx01fUj0ogg632P1EpEjvTbLkdxBTBOaLF9VAE0gsFNfE/YKUeGP5rM6c/2T3Qqk cIzHp8viaqnH1heVu2Jxt5N+/kY0ToduPSk+6vo61S/guglGib1oAx4CZPKesIdLMzS1 X3u0tVZ8ZtoKkwrZ3kdBexEZZ3bNgU3kFM9tXpFiCpGaAT6sHFaAINePK9CDs4EjTOJv z4a+BlWqNMG9oHg2OV9mzvdz87sKsTCr2E/16ArW8Z8bXU042VVgxYG4DEN9s+1Cked6 aakQ== 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=YQ0xJAyjb7FJaZ9jB6f3KgSun1odG6YgQTepffzmB+c=; b=cjHwxf8mwFVUDEr/fVlOyPi2jtTpkkrOzP6TruRM6PHOf9lhV4sSgb0xl7yW65xTsW KYkIfOcpWGxbzAtYg1Fke0jV4e3CwD1YZo+UALsD5S+Zx4iQWKtHyG+j+JtrA+nHSAOv hFyiRWINFweTd8rFBUc6RcXt6XyBAIqmCBpfWV0nr2H6qQctRFWDpStRhAcVe4nXY59a uPCVcy8hnPBuF8BfWUf2CZdoSOSdlzSctPrP7vOMVo0M901leCq+EX0jDoWjlj/m7RBG sjY1/NZNhhbPRtxL/Au1pq2MRNrSCdqGCTRdrKpvsaZfOJSDEM2o5yFOFJmHyFXTxMJu lZfg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id e4si142485ljn.1.2020.04.23.06.54.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 06:54:48 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 03NDslIx013738 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 15:54:47 +0200 Received: from [139.22.135.18] ([139.22.135.18]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NDsllD023735; Thu, 23 Apr 2020 15:54:47 +0200 From: Jan Kiszka Subject: [PATCH] debianize: Add placeholder for original version to CHANGELOG_V To: isar-users , Henning Schild Message-ID: <519bc1ac-721d-e2b2-d23d-92913deded39@siemens.com> Date: Thu, 23 Apr 2020 15:54:47 +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: a0PT2kqzuLug 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) + 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 -- 2.16.4