diff mbox series

[isar-cip-core] layer.conf: Move SOURCE_EPOCH to kas-cip.yml

Message ID 20240408124535.300693-1-Quirin.Gylstorff@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] layer.conf: Move SOURCE_EPOCH to kas-cip.yml | expand

Commit Message

Gylstorff Quirin April 8, 2024, 12:44 p.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This allows downstream layers to overwrite the SOURCE_DATE_EPOCH with
there own implementation.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
Was there an reason for the 'Immediate variable expansion' `:=`?
In the shell the variable is expanded correctly.

 conf/layer.conf | 1 -
 kas-cip.yml     | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Felix Moessbauer April 8, 2024, 2:24 p.m. UTC | #1
On Mon, 2024-04-08 at 14:44 +0200, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> This allows downstream layers to overwrite the SOURCE_DATE_EPOCH with
> there own implementation.

Thanks for fixing this.

Acked-by: Felix Moessbauer <felix.moessbauer@siemens.com>

Felix

> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> Was there an reason for the 'Immediate variable expansion' `:=`?
> In the shell the variable is expanded correctly.
> 
>  conf/layer.conf | 1 -
>  kas-cip.yml     | 2 ++
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 82b4084..6198e1b 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -25,4 +25,3 @@ 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-cip.yml b/kas-cip.yml
> index d10161f..737cfa0 100644
> --- a/kas-cip.yml
> +++ b/kas-cip.yml
> @@ -41,6 +41,8 @@ local_conf_header:
>      USERS += "root"
>      USER_root[password] = "root"
>      USER_root[flags] = "clear-text-password"
> +  source_epoch: |
> +    SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-
> core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
>  
>  env:
>    DISTRO_APT_PREMIRRORS: ""
Jan Kiszka April 8, 2024, 5:27 p.m. UTC | #2
On 08.04.24 14:44, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> This allows downstream layers to overwrite the SOURCE_DATE_EPOCH with
> there own implementation.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> Was there an reason for the 'Immediate variable expansion' `:=`?
> In the shell the variable is expanded correctly.
> 
>  conf/layer.conf | 1 -
>  kas-cip.yml     | 2 ++
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 82b4084..6198e1b 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -25,4 +25,3 @@ 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-cip.yml b/kas-cip.yml
> index d10161f..737cfa0 100644
> --- a/kas-cip.yml
> +++ b/kas-cip.yml
> @@ -41,6 +41,8 @@ local_conf_header:
>      USERS += "root"
>      USER_root[password] = "root"
>      USER_root[flags] = "clear-text-password"
> +  source_epoch: |
> +    SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
>  
>  env:
>    DISTRO_APT_PREMIRRORS: ""

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/conf/layer.conf b/conf/layer.conf
index 82b4084..6198e1b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -25,4 +25,3 @@  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-cip.yml b/kas-cip.yml
index d10161f..737cfa0 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -41,6 +41,8 @@  local_conf_header:
     USERS += "root"
     USER_root[password] = "root"
     USER_root[flags] = "clear-text-password"
+  source_epoch: |
+    SOURCE_DATE_EPOCH := "${@bb.process.run("git -C ${LAYERDIR_cip-core} log -1 --pretty=%ct | tr -d '\n'")[0]}"
 
 env:
   DISTRO_APT_PREMIRRORS: ""