All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: cip-dev@lists.cip-project.org
Cc: jan.kiszka@siemens.com,
	Quirin Gylstorff <quirin.gylstorff@siemens.com>,
	dinesh.kumar@toshiba-tsip.com, venkata.pyla@toshiba-tsip.com,
	kazuhiro3.hayashi@toshiba.co.jp,
	Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [isar-cip-core][PATCH 1/1] Revert "kas/opt/reproducible.yml: Move SOURCE_DATE_EPOCH to layer.conf"
Date: Fri,  5 Apr 2024 08:47:57 +0200	[thread overview]
Message-ID: <20240405064757.378647-1-felix.moessbauer@siemens.com> (raw)

This change is too invasive. The layer.conf is read after the local
conf. By that, there is no way for a downstream user to set it to a
different value.

This reverts commit fcdbec9d2ab1daebd19e021c2b90ed30d0eeae00.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 conf/layer.conf          | 2 --
 kas/opt/reproducible.yml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 82b4084..2c888b2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -24,5 +24,3 @@ LAYERDIR_cip-core = "${LAYERDIR}"
 LAYERDIR_cip-core[vardepvalue] = "isar-cip-core"
 
 IMAGE_CLASSES += "squashfs verity swupdate"
-
-SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
diff --git a/kas/opt/reproducible.yml b/kas/opt/reproducible.yml
index bc71f28..5d6a896 100644
--- a/kas/opt/reproducible.yml
+++ b/kas/opt/reproducible.yml
@@ -13,4 +13,5 @@ header:
 
 local_conf_header:
   reproducible-builds: |
+    SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
     WIC_DEPLOY_PARTITIONS = "1"
-- 
2.39.2



             reply	other threads:[~2024-04-05 12:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-05  6:47 Felix Moessbauer [this message]
2024-04-05 17:48 ` [isar-cip-core][PATCH 1/1] Revert "kas/opt/reproducible.yml: Move SOURCE_DATE_EPOCH to layer.conf" Jan Kiszka
2024-04-08  7:02   ` Gylstorff Quirin
2024-04-08  7:16     ` MOESSBAUER, Felix
2024-04-08  7:58       ` Gylstorff Quirin

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=20240405064757.378647-1-felix.moessbauer@siemens.com \
    --to=felix.moessbauer@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=dinesh.kumar@toshiba-tsip.com \
    --cc=jan.kiszka@siemens.com \
    --cc=kazuhiro3.hayashi@toshiba.co.jp \
    --cc=quirin.gylstorff@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.