From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:a5d:5487:0:b0:2bc:214e:dbcd with SMTP id h7-20020a5d5487000000b002bc214edbcdmr1649718wrv.685.1673840207312; Sun, 15 Jan 2023 19:36:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:250:b0:269:604b:a0dd with SMTP id m16-20020a056000025000b00269604ba0ddls7350363wrz.0.-pod-prod-gmail; Sun, 15 Jan 2023 19:36:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXvYXBrjk76rvNHE+CPOhDXKqO/+sRK3DrK4kQ37wjS2elmXLJq/wxG7wKPB5bROO2jse6UH X-Received: by 2002:a5d:4cc8:0:b0:2bd:d779:c1b5 with SMTP id c8-20020a5d4cc8000000b002bdd779c1b5mr7147536wrt.27.1673840206073; Sun, 15 Jan 2023 19:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673840206; cv=none; d=google.com; s=arc-20160816; b=GjU/zYrtRJi7SYDn5UVWjTJneE37xYf98czkdGzCOqO/lwy8dcgcGWhwJ50XOZtrrJ F5hYynSOXiYtRekrm+sjir+MEyaZWDjsAeqhqqm/yjBKbzU7m3BOiAD2+Qv39Nh6yCMB 1E6cAKXw9jiH5FvaL2DhW+wC9TXdtWXWIsCA6IlDFTfQ4Hb1M+9nIBAWvhoRcIHykAbo mIFxHpEkqP3zB0E9+p3r5v0s9C+KR/AaZELIit6813SEbh8/psI5YODuiM1Ke0l0TYld LpWyURznknsbHhDBjo4BTixwix1V9qHFKkSoCO61yy0t6UNzrDlccXdx2o1/5xe3eSJp KVkg== 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=0KrXOa+mGKiuLmsBLVqV0tIp3S58FNIYp8z7h5JXhePYdwvHdz9QeIvZTMkpJAJKIk 3p2vg385JR7z7fJQfn/ch4INfS9S7p10Z6ou0Qkfqz+upKS+MD7gNDn8b9THsFC4J0fe mBt6USPb5l9ygrDVFD6BnspWWT+mWrtn3KKxkyRW3pTOPKqjoH0xc0ZuDrsiWECoZiNX ZL1hVMBd0IqBWt+qU0z7h54FA8JR5xVxrfycdFVyabzDncH5JOSNJIwv2gUPmE7j//L/ Hmj6998ZXi89WLzA+wVBHhtN4odGL36iBLZj6BVZUbsqENRxJ4q2CexoZgClrEDCoXoa KDEQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FF5HPHbi; spf=pass (google.com: domain of fm-72506-20230116033645a722d68aad00972209-4wt0cc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20230116033645a722d68aad00972209-4wt0cC@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id m7-20020a5d56c7000000b0023677081f0esi1219234wrw.7.2023.01.15.19.36.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jan 2023 19:36:46 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230116033645a722d68aad00972209-4wt0cc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FF5HPHbi; spf=pass (google.com: domain of fm-72506-20230116033645a722d68aad00972209-4wt0cc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20230116033645a722d68aad00972209-4wt0cC@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20230116033645a722d68aad00972209 for ; Mon, 16 Jan 2023 04:36: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=FF5HPHbiTyf/TtFCWBA7QM0P1baxgNX+ez+cGG9AQLEw6ffcz/rcHMXmMyn1b2AC1Y7QgQ fRNTLHRtMgJKrPDoNk31grkTy/Sairdeq3NQ6aCRS6NKcngKZTv1YfDEbnvG7zJnPh9Uq5kl ziFY1LkV5E5VVv8A8o6oyuCHy9BVo=; 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 v3 08/10] make deb_add_changelog idempotent Date: Mon, 16 Jan 2023 03:35:50 +0000 Message-Id: <20230116033552.139048-9-felix.moessbauer@siemens.com> In-Reply-To: <20230116033552.139048-1-felix.moessbauer@siemens.com> References: <20230116033552.139048-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: HKVgFh6VMZxi 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