From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:a05:651c:b0d:b0:281:4287:39c4 with SMTP id b13-20020a05651c0b0d00b00281428739c4mr1488310ljr.38.1673410383301; Tue, 10 Jan 2023 20:13:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:301a:0:b0:27f:e626:ad40 with SMTP id w26-20020a2e301a000000b0027fe626ad40ls1994774ljw.1.-pod-prod-gmail; Tue, 10 Jan 2023 20:13:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXuh9SBwbSJZBdz5yP/tPBFH6Zi4/m7TU4gS2E7q003TZkvOv2jm7TRKpQ7UqKvBNtOq0zo1 X-Received: by 2002:a05:651c:1992:b0:27f:ae36:83af with SMTP id bx18-20020a05651c199200b0027fae3683afmr25072155ljb.9.1673410381780; Tue, 10 Jan 2023 20:13:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673410381; cv=none; d=google.com; s=arc-20160816; b=Is9g5y8p9MJp+1HQBvzdF/Tqq2Qq1pDxZNaRwGWv0g7h52F6Z1AdY1pNwSKLBHyGpX dlrv/zHu5iG6hTe/AIwq15hplA15TPhw7brwXyGGzKg/mgcawnJ8N7J94v7N2EZeTAO9 UI2jovD0q4QU2yR22m5HlG+mKCXvGsdLZJNh/Psx9SwdIaB0PdLUx8P0K/WMZshwtoLm 67h0GuooV6PGroXYGtRQUkw14fnNpwBQjQYPhezeSCOPW97e7uodxpXfYbIfq/Qsoo0R ASoPGzyLI27Mlk8f+0sKXVo7DGWOLfDj7G9zQDMntYkZhiCYVC16bdniDZwcw9eDXMGO B/kw== 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=uGlBNMxTEv7H/8TrWJCleht6fbo3t1ljx/ksBNaE6xU=; b=IHPt8BS5p+7yduieOz2sOFpysbR3sD9nvbn9O+6pOT8sJCDK0194FDL/BAuUUS4wqg JTc48SE3ynJfVR7aZETP3CbO2OlXKMCPUhMYE08HhE1Iyo5E2X24T4Fpgb7o+rT+vyCq yR6hmOspE7nlyF8nWvdgAXGfHCKZuSjcfmkslcmhV7NIXI/xle677Tkq2dGGArcmJPqE vhCMzhWmjhofapHz0uEGb6EdOPWUC+sebxF9a1x0o6ka3V1FKmCk8jX+VQSx+tdyB4oY mPG5Z4qhTreMn/1ll/N83kaaq/X9hZUywqydf0zpiY2PM4gJiuATB+x1/yroBlRczVtO 350A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=GQqDPPoA; spf=pass (google.com: domain of fm-72506-202301110413017f590fa0f50177e10a-dqg34x@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202301110413017f590fa0f50177e10a-Dqg34X@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 k9-20020a2ea269000000b0028002e5a082si581186ljm.4.2023.01.10.20.13.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 20:13:01 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202301110413017f590fa0f50177e10a-dqg34x@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=GQqDPPoA; spf=pass (google.com: domain of fm-72506-202301110413017f590fa0f50177e10a-dqg34x@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-202301110413017f590fa0f50177e10a-Dqg34X@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 202301110413017f590fa0f50177e10a for ; Wed, 11 Jan 2023 05:13:01 +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=uGlBNMxTEv7H/8TrWJCleht6fbo3t1ljx/ksBNaE6xU=; b=GQqDPPoAbY6nF0Vc6tSDss++hdJx203L0lpqbKZn08MSUOBljYvw4yS/QXQAC2tXwSYS2m eQcibE8OdUphT0nmjYWFIbasFcpbpZpoNqeYTTZKEyi/jUr/RVw7uHE/rnFx2uByaL5P8jGF 7jEtxZZycw5fgc005sac8vqt4hQFA=; 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 10/11] deb_add_changelog: use SOURCE_DATE_EPOCH Date: Wed, 11 Jan 2023 04:11:39 +0000 Message-Id: <20230111041140.3460393-11-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: DV7XrZ9EJG2F 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index a6694a0..3d5d934 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' } if [ -f ${S}/debian/changelog ]; then if [ ! -f ${WORKDIR}/changelog.orig ]; then cp ${S}/debian/changelog ${WORKDIR}/changelog.orig @@ -23,9 +23,11 @@ deb_add_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) + 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 fi -- 2.34.1