From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7186516587736727552 X-Received: by 2002:a05:600c:358f:b0:3cf:7716:8954 with SMTP id p15-20020a05600c358f00b003cf77168954mr4594018wmq.57.1673241301126; Sun, 08 Jan 2023 21:15:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5a11:0:b0:225:6559:3374 with SMTP id bq17-20020a5d5a11000000b0022565593374ls6506953wrb.2.-pod-prod-gmail; Sun, 08 Jan 2023 21:14:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXutRzmm/oQmA/WWvxmZFSuX1e6dKjwV0mX9Wsvtgo2i/A0Vni+fRNr40ZS0Ydq9xik0ZJyi X-Received: by 2002:adf:e9d1:0:b0:2bb:6d44:5bc with SMTP id l17-20020adfe9d1000000b002bb6d4405bcmr3763849wrn.17.1673241299812; Sun, 08 Jan 2023 21:14:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673241299; cv=none; d=google.com; s=arc-20160816; b=XxX6d0i1/E1pBhTeb8xiLJSTwIGdEHndOWmalw72O6wToll1LXqQRn69aT5o8lqOW5 +3Ne0CObdMOaXOiz1yIDrRqzeX9jYAj4QcZwQaSvG5uqCENitPK7T0UC1z/q9z2W6BiG dHp3X0AKyb8pfrUS463J70AHKb0Bj007HWRWOT7wZ9Rcc3boybW81cDhJG4u1e112Qft e3EenKuCzvH0GE6k6kw+mGLW1xb55yL5je2pMgAkewRfo+uxVaO1iG5rXJ5MOp4yzmjk E+35Wz/gr5zG014ONkuPjGx02icJNiZF3J1+YBzT29dpbEHy18WAak/tRQuXwnq6hXUY cOvQ== 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=TtD2AgsF1iFoWDtNo1nJp6ifOdaOrkF4/4Yfm3jx/Jk=; b=M8Bt4KuSxvRZjd4d3snzypDpEmtNASXjXoqupu+SZbRnHhedIeDl6NZEjMNd4WkR/g NrcFvVjU0Y8LK8Zm8ga0oeVctj2ELMANAofbbHkMHJJGh2QsXD38Sz/4jk4hPKuUdqLK lxhyWdY1lYtchFn33tQs5hnskLcr+75peLn9ppMq/1lgCIZoSQqaosOHguEcc6N/1lqD rAhWinn/0h9uvPwBYA3uic3oeIo3tLY/0WruIX12BPAPLfCv/Ej5Ftv3JQbrJuY+YpOl re0/mS7Pq38uAiGR/wrf49jzlMgV0cnGzcEKNBZfMP2Hx3UPzjYt64L3ALQ1d+KaTWG9 O+Iw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V3PrEvHV; spf=pass (google.com: domain of fm-72506-20230109051459c78e194f6f3eafbab8-g6p7rk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230109051459c78e194f6f3eafbab8-g6P7Rk@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id bt2-20020a056000080200b0025dd2434f36si317340wrb.2.2023.01.08.21.14.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2023 21:14:59 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230109051459c78e194f6f3eafbab8-g6p7rk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V3PrEvHV; spf=pass (google.com: domain of fm-72506-20230109051459c78e194f6f3eafbab8-g6p7rk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-72506-20230109051459c78e194f6f3eafbab8-g6P7Rk@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20230109051459c78e194f6f3eafbab8 for ; Mon, 09 Jan 2023 06:14:59 +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=TtD2AgsF1iFoWDtNo1nJp6ifOdaOrkF4/4Yfm3jx/Jk=; b=V3PrEvHVMdfTcsmUMQ8ykaeKYjQONG9urVLAn+mW+tiao7TbhU5l3MLZResJM5J9HkrcWs xG17cFKdI+cZehsUXXQ2YgzhhoOPk6j7/iAR0i8peDpHovDo2Do0SLaeZlEkNQgHpBhVqfu8 d9k/bghkYLH/+uGBaRr3J26360fSc=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, henning.schild@siemens.com, venkata.pyla@toshiba-tsip.com, Felix Moessbauer Subject: [PATCH 3/3] deb_add_changelog: use SOURCE_DATE_EPOCH Date: Mon, 9 Jan 2023 05:14:28 +0000 Message-Id: <20230109051428.450854-4-felix.moessbauer@siemens.com> In-Reply-To: <20230109051428.450854-1-felix.moessbauer@siemens.com> References: <20230109051428.450854-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: KfKTrjzLoUd+ 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 --- 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 " 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_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