From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7186516587736727552 X-Received: by 2002:a05:600c:2f17:b0:3cf:a6e8:b59b with SMTP id r23-20020a05600c2f1700b003cfa6e8b59bmr4349569wmn.128.1673260782369; Mon, 09 Jan 2023 02:39:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c90:b0:3c6:c1ff:1fd with SMTP id k16-20020a05600c1c9000b003c6c1ff01fdls4539914wms.2.-pod-canary-gmail; Mon, 09 Jan 2023 02:39:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXtbrg089QQw3UStRFrvLKGi3Lkm+3i64teJ6KI3CAuwJyXUffPDlJ7mlTb8cQkunjVs5nVI X-Received: by 2002:a7b:c851:0:b0:3d9:f067:1c32 with SMTP id c17-20020a7bc851000000b003d9f0671c32mr1767970wml.29.1673260779568; Mon, 09 Jan 2023 02:39:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673260779; cv=none; d=google.com; s=arc-20160816; b=1KpoezOWrU7QeowiiuZUzC0qZrSnQvBvfPCa0Ze3PAfxrHvQNrB7lhmsw3ZpUQm30v kEEpCzn6mzaP/GDgPtHqSHdhakn0RrQlSZvC8GEWzM+VjtWlicmFmDLe5/p2xLAPTWC3 dQlTcj7wacPB5HAI5Fjhs/P2U6QH28ijU1YUgPSwhNFKAw9d4dYeDm1Tr/76KHmvM2Us LjbrGbHJH+KdQ4JWUr4wJrkJCkBegmnPUNLkHqTSh7VB8l+Szzp5c7MUScCuZHHnB/Ew 6G9wjWlvdGaJqBAYDJK6asvEXjwLkDJNd0sCWQ+V5DBaMXB+0OECSqpqPuBNCEvBJ7ty wV5w== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=uGlBNMxTEv7H/8TrWJCleht6fbo3t1ljx/ksBNaE6xU=; b=ZG6o2qLJ+2xYhEWUC2noN2hjmyDaP3u8bU262rVDGU+drxhIbAcEEoDYHmjMVkttqw 2XN9LyuPuPDhyG6ukH9rCt6EnHbhXG8DVdEsoWkqAY1cVIconmllXIbvXNqzfsUYrf5d 1twdLFs/YRz70yGnDt15bg3TUCHNjoIekBT9hVegjbSoyiAUgva4twORCr52JXMDrikN zfTsFmZEgRvA7Dn0L45U56pBWL+wQqW7PGy9tNAVpWyDuedSo7xhFD8CH8j6kNZq2bnZ 2SatLPTHtURnmO3uXpizsnt2m/AOjEleehpeLEQn0cRvaj8NysEA4xxVe6CdsCz5KZ8V fk9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=TqxAxOZK; spf=pass (google.com: domain of fm-72506-202301091039393837cfe06c5d8881e9-z6slox@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202301091039393837cfe06c5d8881e9-Z6slOX@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 s1-20020a5d4ec1000000b0024222ed1370si340241wrv.3.2023.01.09.02.39.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jan 2023 02:39:39 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-202301091039393837cfe06c5d8881e9-z6slox@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=TqxAxOZK; spf=pass (google.com: domain of fm-72506-202301091039393837cfe06c5d8881e9-z6slox@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-202301091039393837cfe06c5d8881e9-Z6slOX@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 202301091039393837cfe06c5d8881e9 for ; Mon, 09 Jan 2023 11:39:39 +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; bh=uGlBNMxTEv7H/8TrWJCleht6fbo3t1ljx/ksBNaE6xU=; b=TqxAxOZKZqTpLAR4GhJEu5bZvfuQGxoKSvDe7E3+0ds3P0Lvu5sXHs3JflLG0i+PlyvazJ khiXHUQj3zGvx4n5VXTf5aqdBgSbzMOiShiYCk3IMxHp1/ySFDEEuJrO/aSfUr+Hyx3XWnIN 7FpszgzqyuNsLd+gwKitFOQRh0eRk=; 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 v2 3/3] deb_add_changelog: use SOURCE_DATE_EPOCH Date: Mon, 9 Jan 2023 10:39:29 +0000 Message-Id: <20230109103929.1436953-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: CXc0TtCRb7Ad 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