public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: jan.kiszka@siemens.com, henning.schild@siemens.com,
	venkata.pyla@toshiba-tsip.com,
	Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 3/3] deb_add_changelog: use SOURCE_DATE_EPOCH
Date: Mon,  9 Jan 2023 05:14:28 +0000	[thread overview]
Message-ID: <20230109051428.450854-4-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20230109051428.450854-1-felix.moessbauer@siemens.com>

In case the SOURCE_DATE_EPOCH bb variable is set, use that value
both for the auto-generated changelog as well as when appending to
an existing changelog.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/debianize.bbclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
index 3531421..49ae0dd 100644
--- a/meta/classes/debianize.bbclass
+++ b/meta/classes/debianize.bbclass
@@ -14,7 +14,7 @@ MAINTAINER ??= "Unknown maintainer <unknown@example.com>"
 
 deb_add_changelog() {
 	changelog_v="${CHANGELOG_V}"
-	timestamp=3600
+	timestamp=${@ d.getVar('SOURCE_DATE_EPOCH', True) or '3600' }
 	# we have a changelog and that is not autogenerated
 	# (when autogenerated, changelog.orig is empty)
 	if [ -f ${S}/debian/changelog ] && [ -s ${WORKDIR}/changelog.orig ]; then
@@ -23,9 +23,11 @@ deb_add_changelog() {
 		fi
 		orig_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Version)
 		changelog_v=$(echo "${changelog_v}" | sed 's/<orig-version>/'${orig_version}'/')
-		orig_date=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Date)
-		orig_seconds=$(date --date="${orig_date}" +'%s')
-		timestamp=$(expr ${orig_seconds} + 42)
+		if [ -z "${SOURCE_DATE_EPOCH}" ]; then
+			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})
@@ -42,7 +44,6 @@ EOF
 	# prepend our entry to the original changelog
 	echo >> ${S}/debian/changelog
 	cat ${WORKDIR}/changelog.orig >> ${S}/debian/changelog
-	fi
 
 	if [ -f ${WORKDIR}/changelog ]; then
 		latest_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog -S Version)
-- 
2.34.1


  parent reply	other threads:[~2023-01-09  5:14 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-09  5:14 [PATCH 0/3] Fix reproducability issues in deb_add_changelog Felix Moessbauer
2023-01-09  5:14 ` [PATCH 1/3] make deb_add_changelog idempotent Felix Moessbauer
2023-01-09  9:19   ` Henning Schild
2023-01-09 10:42     ` Moessbauer, Felix
2023-01-09  5:14 ` [PATCH 2/3] deb_add_changelog: set timestamp to valid epoch Felix Moessbauer
2023-01-09  5:14 ` Felix Moessbauer [this message]
2023-01-09  5:34   ` [PATCH 3/3] deb_add_changelog: use SOURCE_DATE_EPOCH Jan Kiszka
2023-01-09  9:25   ` Henning Schild
2023-01-09 10:24     ` Moessbauer, Felix
2023-01-09 10:30     ` Jan Kiszka
2023-01-09  9:28 ` [PATCH 0/3] Fix reproducability issues in deb_add_changelog Henning Schild
2023-01-09 10:33   ` Moessbauer, Felix

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230109051428.450854-4-felix.moessbauer@siemens.com \
    --to=felix.moessbauer@siemens.com \
    --cc=henning.schild@siemens.com \
    --cc=isar-users@googlegroups.com \
    --cc=jan.kiszka@siemens.com \
    --cc=venkata.pyla@toshiba-tsip.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox