From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:a05:6512:ea0:b0:4ca:fff2:901c with SMTP id bi32-20020a0565120ea000b004cafff2901cmr6518417lfb.473.1673410367425; Tue, 10 Jan 2023 20:12:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:214f:b0:4c8:8384:83f3 with SMTP id s15-20020a056512214f00b004c8838483f3ls5007776lfr.3.-pod-prod-gmail; Tue, 10 Jan 2023 20:12:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXv7pLIEMcsznmlS4g4EhJG6V6jRqBqc4KzAxC5tBwOoPXdIJo6/hrvCieev1ayXeshly/1X X-Received: by 2002:a05:6512:2987:b0:4ca:877d:a546 with SMTP id du7-20020a056512298700b004ca877da546mr1886028lfb.12.1673410365932; Tue, 10 Jan 2023 20:12:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673410365; cv=none; d=google.com; s=arc-20160816; b=LiWWMQQo0tUyjeVAsDV8vL9M6B8IzbjRcxynozZTEkzAWoD3vAxwFCxHXEyY3Uxe/Z 03C/mM8vSLsj6wAMDjfjZ4Bdh7usvarirEgKD2vYFkGCpHyDShtlr4Gtl3lRGLrKZsnk Cc0ehDtKVMpetYTAwBfM2RqLv+7wAVQ1n+ib5gtoI9I2jNAakkcPFy8XqTpTBBAQHJWc BF3hLDiBYHuOSzRAlqLy1+8inF/GIQfhevNPaMZC9jPyYN+yyv00e941VhwIzpKKRxq5 TvgEkf1HYTWLMq2xFk0yk1ziRQIcI1IUaiWQSvwr/34SU6CbHNM72WCmql2dEvOybUKy wIpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=QqbcXhbe4KccR0xbhfT2wrZ7MnzzPx/uz+mpgI6ANds=; b=If7gRYbtK9V51FePg95X0PDCZlR5NQ/Ab/6/pQNU1VpG4I4Gm0E5LxGfaakAqVNirI ROwqer15nc0442vR9nUDip9vp0IQZF26qd02ZJhAkv0xwAzB/8oSsFfeLwmrT7XX6rdW VWKYrPxZ/5ZNK8TmMWtL+Tuf4gcY2Vylwui5UQSevrAXQXBIChvg+lNbs30KMmXmkXfD PjoGXffEJjHdk4yIyOr0uano+c7AFF+rqsvZZMvyKaKgbmntiUaxE8/m16DDMiPTDd7x HIhnh4nHjKy/dWWhjFzS3a5+AacElLCxFo/1lqH2ekvQXXgpcGIR4KVkr2qexAMJXHe0 GLMw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FnqRr1Cw; spf=pass (google.com: domain of fm-72506-202301110412459c8cbb79fa287c6df8-q0tygk@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202301110412459c8cbb79fa287c6df8-Q0TygK@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id j11-20020a056512344b00b004b49cc7bf6asi605617lfr.9.2023.01.10.20.12.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 20:12:45 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202301110412459c8cbb79fa287c6df8-q0tygk@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FnqRr1Cw; spf=pass (google.com: domain of fm-72506-202301110412459c8cbb79fa287c6df8-q0tygk@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202301110412459c8cbb79fa287c6df8-Q0TygK@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202301110412459c8cbb79fa287c6df8 for ; Wed, 11 Jan 2023 05:12:45 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=QqbcXhbe4KccR0xbhfT2wrZ7MnzzPx/uz+mpgI6ANds=; b=FnqRr1CwNF4xlcJ+HHMFSe2mzAgmsiwW3QLr8CGa8Xwtr5rYgUbNa4GsGuibvqi2CGCSgo ycNPCgLuiZrPWTFcpDhKJbR56jdMW0oXmbEhpadejEmAEsjxW9l0MmoGykrMETrChU009z1y /GfOzzAQVTL5hKKdxztABvT4qAYpw=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, daniel.bovensiepen@siemens.com, henning.schild@siemens.com, venkata.pyla@toshiba-tsip.com, Felix Moessbauer Subject: [PATCH 08/11] make deb_add_changelog idempotent Date: Wed, 11 Jan 2023 04:11:37 +0000 Message-Id: <20230111041140.3460393-9-felix.moessbauer@siemens.com> In-Reply-To: <20230111041140.3460393-1-felix.moessbauer@siemens.com> References: <20230111041140.3460393-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: sOmRBC189S7P Previously, the deb_add_changelog function considered an auto-generated changelog as a base to add changes on top. This behavior is not idempontent on subsequent invocations of the function (e.g. on partial rebuilds). This lead to both reproducability issues, as well as unclean changelog files having multiple "generated by ISAR" entries. This patch changes this implementation in a way to always create a (possibly empty) orig changelog on the first invocation. On subequent invocations, the orig changelog is only considered as provided by the user, if it is not empty. Signed-off-by: Felix Moessbauer --- meta/classes/debianize.bbclass | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index d125256..ca7b520 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -19,11 +19,14 @@ deb_add_changelog() { 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}'/') - orig_date=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Date) - orig_seconds=$(date --date="${orig_date}" +'%s') - timestamp=$(expr ${orig_seconds} + 42) + # we have a non auto-generated original changelog + if [ -s ${WORKDIR}/changelog.orig ]; then + orig_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Version) + changelog_v=$(echo "${changelog_v}" | sed 's//'${orig_version}'/') + orig_date=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Date) + orig_seconds=$(date --date="${orig_date}" +'%s') + timestamp=$(expr ${orig_seconds} + 42) + fi fi date=$(LANG=C date -R -d @${timestamp}) @@ -34,7 +37,10 @@ ${PN} (${changelog_v}) UNRELEASED; urgency=low -- ${MAINTAINER} ${date} EOF - if [ -f ${WORKDIR}/changelog.orig ]; then + # ensure that we always start with the orig version of the + # changelog on repeated invocations (e.g. on partial rebuilds) + touch ${WORKDIR}/changelog.orig + if [ -s ${WORKDIR}/changelog.orig ]; then # prepend our entry to the original changelog echo >> ${S}/debian/changelog cat ${WORKDIR}/changelog.orig >> ${S}/debian/changelog -- 2.34.1