From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818905211330887680 X-Received: by 2002:a7b:cbc6:: with SMTP id n6mr5056905wmi.155.1587656386675; Thu, 23 Apr 2020 08:39:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:5644:: with SMTP id k65ls736992wmb.1.gmail; Thu, 23 Apr 2020 08:39:46 -0700 (PDT) X-Google-Smtp-Source: APiQypINcyiuBsP2IVLeMDE/vx+GLpLh1QEldeJMdrxyohlM5NSnUeR2hbW6qVmPjsXrcx4UDeMZ X-Received: by 2002:a05:600c:c5:: with SMTP id u5mr5010791wmm.134.1587656385994; Thu, 23 Apr 2020 08:39:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587656385; cv=none; d=google.com; s=arc-20160816; b=fIoqcmJLFhFrWG096Pj5P2owioEPFkAlnrC1C5HOKQWrJ09BaNUcQ8xV+jXdG+Xaz7 guo8omzGrtlUBYBW2btLrq9LV9b7ju6MaLQlnjhZxBb5R4OcqVn7t+a3mz7p0zH76lPf uucH7a9N0wmfbwO6SJVrHjZBDRbxHEk38+vGx3OG2G+bO4Sn/SGnR0M80DTfKUarpAqT pOVhvzupexoJYzE50HFCWuEzr72KFT9qdLdYlQtBQz5ilRKDNckAr9+iYiPNSpDftgVS lAGqn+QgWDpmMUjmHfl1jn82S9albrzaTMKNeZOmzmY5wtMZW8dTXp7e4MNUkxZeGLaH GEww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:to:from:subject; bh=AnJN7Vt3aWmvqz1JZU+4wiQCvsZ3kRQIsOCdlqcIP8Y=; b=KcbdACN25MjTYn2xV4nCjs6WknKMwsl6J/PEqHzhFXf8yV75eUA9Z9SyMhIMN5EFYF Hcqo/woJjQROgZbEql6yxPpGEc7ERtx2nOOZF/p7iuuvMRa3wGTxY51JvuHPyMyg8fpg YjY6yTOS6RMXXqTMccoWvPuto7NR0t1L2ctPmzweLEkZONj8ZmSrDlrjfSIXCbj/p9Mf /P4Mgwcz9m8ko3EYzDF+3MCPyOC+TBEOel3N0XAet7bWx/0osOxfgoJLkx/xzB0Iz4yJ zCdfwcVyKytPJkOA/xe6JF96MCXj7fy0DK++iakD5BVfiJnR8l1QF01jC0eVUDigYJtX +u+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 u25si631646wmm.3.2020.04.23.08.39.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2020 08:39:45 -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 03NFdjwJ002220 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 23 Apr 2020 17:39:45 +0200 Received: from [139.22.135.18] ([139.22.135.18]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03NFdifI016929; Thu, 23 Apr 2020 17:39:45 +0200 Subject: Re: [PATCH v2] debianize: Add placeholder for original version to CHANGELOG_V From: Jan Kiszka To: isar-users , Henning Schild References: Message-ID: <8c33278f-87f1-3d3f-fe0c-96d2c2af0b2d@siemens.com> Date: Thu, 23 Apr 2020 17:39:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: dtzfR8xZ71tu On 23.04.20 17:25, [ext] 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 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 > This is broken, v3 will follow - after it passed basic CI. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux