kas: Allow to define custom snapshot date

Message ID 010cb6be-1909-4113-86b8-22f9f2365c28@siemens.com
State Superseded, archived
Headers show
Series kas: Allow to define custom snapshot date | expand

Commit Message

Jan Kiszka Oct. 4, 2024, 10:20 a.m. UTC
From: Jan Kiszka <jan.kiszka@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.kiszka@siemens.com>
---
 kas/opt/Kconfig | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

Comments

Felix Moessbauer Oct. 7, 2024, 7:26 a.m. UTC | #1
On Fri, 2024-10-04 at 12:20 +0200, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@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.kiszka@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"

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
>
Jan Kiszka Oct. 7, 2024, 9:57 a.m. UTC | #2
On 07.10.24 09:26, Moessbauer, Felix (FT RPD CED OES-DE) wrote:
> On Fri, 2024-10-04 at 12:20 +0200, 'Jan Kiszka' via isar-users wrote:
>> From: Jan Kiszka <jan.kiszka@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.kiszka@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"
> 
> 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.

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
alexander.heinisch Oct. 7, 2024, 10:57 a.m. UTC | #3
> > 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

> 
> 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.

Patch

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