[PATCH] kas: Allow to define custom snapshot date

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Currently very useful for building constantly broken riscv via sid. The
default value is actually a known-to-work one, taken from isar-cip-core.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
kas/opt/Kconfig | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig
index 65482e3a..de7700f5 100644
--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -44,7 +44,25 @@ config USE_APT_SNAPSHOT
bool "Use the distros snapshot mirror"
depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY)
help
- Use a snapshot mirror for the selected distribution. The date is defined by ISAR_APT_SNAPSHOT_TIMESTAMP.
+ Use a snapshot mirror for the selected distribution.
+
+choice
+ prompt "Snapshot date"
+ depends on USE_APT_SNAPSHOT
+ default APT_SNAPSHOT_GIT_DATE
+
+config APT_SNAPSHOT_GIT_DATE
+ bool "Latest git commit"
+
+config APT_SNAPSHOT_CUSTOM_DATE
+ bool "Custom date"
+
+endchoice
+
+config ISAR_APT_SNAPSHOT_TIMESTAMP
+ string "Custom snapshot date"
+ depends on APT_SNAPSHOT_CUSTOM_DATE
+ default "1707606000"

config KAS_INCLUDE_APT_SNAPSHOT
string
--
2.43.0

[MOESSBAUER, Felix]

The term "date" might be misleading here, as the value is a unix
timestamp. IIRC Alexander wanted to send a similar patch to specify the
apt snaptshot date in the upstream format (e.g. 20240702T082400Z),
making it easier to read.

Either we rename that here to "Custom timestamp", or we wait for the
patch of Alexander and adapt accordingly.

Felix

> +
> +endchoice
> +
> +config ISAR_APT_SNAPSHOT_TIMESTAMP
> +       string "Custom snapshot date"
> +       depends on APT_SNAPSHOT_CUSTOM_DATE
> +       default "1707606000"
>  
>  config KAS_INCLUDE_APT_SNAPSHOT
>         string
> --
> 2.43.0
>

--
Siemens AG, Technology
Linux Expert Center

[Jan Kiszka]

This just exposes an existing isar variable. I can clarify the
description of that string.

I also tried some ad-hoc conversion, but the inline python support of
bitbake is too limited for that (required "import datetime; ..."). We
need some helper in the base class for that.

Jan

[Heinisch, Alexander]

> > The term "date" might be misleading here, as the value is a unix
> > timestamp. IIRC Alexander wanted to send a similar patch to specify
> > the apt snaptshot date in the upstream format (e.g. 20240702T082400Z),
> > making it easier to read.
> >
> > Either we rename that here to "Custom timestamp", or we wait for the
> > patch of Alexander and adapt accordingly.

Just posted: https://groups.google.com/g/isar-users/c/PzIksFyNDyc

BR Alexander

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Currently very useful for building constantly broken riscv via sid. The
default value is actually a known-to-work one, taken from isar-cip-core.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

Changes in v2:
- base on ISAR_APT_SNAPSHOT_DATE patch

Depends on https://patchwork.isar-build.org/project/isar/patch/20241007122709.215901...@siemens.com/

kas/opt/Kconfig | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig

index 1e56c29f..b29a25e5 100644

--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -44,7 +44,25 @@ config USE_APT_SNAPSHOT
bool "Use the distros snapshot mirror"
depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY)
help

- Use a snapshot mirror for the selected distribution. The date is defined by ISAR_APT_SNAPSHOT_DATE.

+ Use a snapshot mirror for the selected distribution.
+
+choice
+ prompt "Snapshot date"
+ depends on USE_APT_SNAPSHOT
+ default APT_SNAPSHOT_GIT_DATE
+
+config APT_SNAPSHOT_GIT_DATE
+ bool "Latest git commit"
+
+config APT_SNAPSHOT_CUSTOM_DATE
+ bool "Custom date"

+
+endchoice
+
+config ISAR_APT_SNAPSHOT_DATE

+ string "Custom snapshot date"
+ depends on APT_SNAPSHOT_CUSTOM_DATE

+ default "20240211T000000Z"

[Heinisch, Alexander]

"Use timestamp of latest git commit"

BR Alexander

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Currently very useful for building constantly broken riscv via sid. The
default value is actually a known-to-work one, taken from isar-cip-core.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

Changes in v3:
- tune wording of menu entry

kas/opt/Kconfig | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig

index 1e56c29f..b1b1ff16 100644

--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -44,7 +44,25 @@ config USE_APT_SNAPSHOT
bool "Use the distros snapshot mirror"
depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY)
help
- Use a snapshot mirror for the selected distribution. The date is defined by ISAR_APT_SNAPSHOT_DATE.
+ Use a snapshot mirror for the selected distribution.
+
+choice
+ prompt "Snapshot date"
+ depends on USE_APT_SNAPSHOT
+ default APT_SNAPSHOT_GIT_DATE
+
+config APT_SNAPSHOT_GIT_DATE

+ bool "Timestamp of latest git commit"

[Uladzimir Bely]

Applied to next, thanks.

--
Best regards,
Uladzimir.