diff mbox series

[isar-cip-core,2/3] conf/distro/cip-core-*: prefer swupdate 2023.12 for all distro except buster

Message ID 20240314123736.1100948-3-Quirin.Gylstorff@siemens.com (mailing list archive)
State Superseded
Headers show
Series Update to SWUpdate | expand

Commit Message

Gylstorff Quirin March 14, 2024, 12:36 p.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/distro/cip-core-bookworm.conf | 3 ++-
 conf/distro/cip-core-bullseye.conf | 2 +-
 conf/distro/cip-core-sid.conf      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Comments

Jan Kiszka March 18, 2024, 11:32 a.m. UTC | #1 
On 14.03.24 13:36, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  conf/distro/cip-core-bookworm.conf | 3 ++-
>  conf/distro/cip-core-bullseye.conf | 2 +-
>  conf/distro/cip-core-sid.conf      | 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
> index 9bcf559..634a666 100644
> --- a/conf/distro/cip-core-bookworm.conf
> +++ b/conf/distro/cip-core-bookworm.conf
> @@ -12,6 +12,7 @@
>  require conf/distro/debian-bookworm.conf
>  require cip-core-common.inc
>  
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_swupdate ?= "2023.12%"
> +PREFERRED_VERSION_libubootenv-dev ?= "0.3.5%"
>  PREFERRED_VERSION_linux-cip ?= "6.1.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
> diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf
> index 4f26299..110f334 100644
> --- a/conf/distro/cip-core-bullseye.conf
> +++ b/conf/distro/cip-core-bullseye.conf
> @@ -15,6 +15,6 @@ require cip-core-common.inc
>  DISTRO_APT_SOURCES:append:swupdate = " conf/distro/debian-bullseye-backports.list"
>  DISTRO_APT_PREFERENCES:append:swupdate = " conf/distro/preferences.swupdate-bullseye-backports.conf"
>  
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_swupdate ?= "2023.12%"
>  PREFERRED_VERSION_linux-cip ?= "5.10.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
> diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
> index aff4572..692c105 100644
> --- a/conf/distro/cip-core-sid.conf
> +++ b/conf/distro/cip-core-sid.conf
> @@ -15,6 +15,6 @@ require cip-core-common.inc
>  DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
>  HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
>  
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_swupdate ?= "2023.12%"

This is a dead leftover. We are using Debian's 2023.12 already in sid.
I'm dropping that line completely.

Jan

>  PREFERRED_VERSION_linux-cip ?= "6.1.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
Jan Kiszka March 18, 2024, 11:35 a.m. UTC | #2 
On 14.03.24 13:36, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  conf/distro/cip-core-bookworm.conf | 3 ++-
>  conf/distro/cip-core-bullseye.conf | 2 +-
>  conf/distro/cip-core-sid.conf      | 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
> index 9bcf559..634a666 100644
> --- a/conf/distro/cip-core-bookworm.conf
> +++ b/conf/distro/cip-core-bookworm.conf
> @@ -12,6 +12,7 @@
>  require conf/distro/debian-bookworm.conf
>  require cip-core-common.inc
>  
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_swupdate ?= "2023.12%"
> +PREFERRED_VERSION_libubootenv-dev ?= "0.3.5%"

This line is not explained - is it actually related?

Jan

>  PREFERRED_VERSION_linux-cip ?= "6.1.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
> diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf
> index 4f26299..110f334 100644
> --- a/conf/distro/cip-core-bullseye.conf
> +++ b/conf/distro/cip-core-bullseye.conf
> @@ -15,6 +15,6 @@ require cip-core-common.inc
>  DISTRO_APT_SOURCES:append:swupdate = " conf/distro/debian-bullseye-backports.list"
>  DISTRO_APT_PREFERENCES:append:swupdate = " conf/distro/preferences.swupdate-bullseye-backports.conf"
>  
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_swupdate ?= "2023.12%"
>  PREFERRED_VERSION_linux-cip ?= "5.10.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
> diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
> index aff4572..692c105 100644
> --- a/conf/distro/cip-core-sid.conf
> +++ b/conf/distro/cip-core-sid.conf
> @@ -15,6 +15,6 @@ require cip-core-common.inc
>  DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
>  HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
>  
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_swupdate ?= "2023.12%"
>  PREFERRED_VERSION_linux-cip ?= "6.1.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
Gylstorff Quirin March 18, 2024, noon UTC | #3 
On 3/18/24 12:35 PM, Jan Kiszka wrote:
> On 14.03.24 13:36, Quirin Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   conf/distro/cip-core-bookworm.conf | 3 ++-
>>   conf/distro/cip-core-bullseye.conf | 2 +-
>>   conf/distro/cip-core-sid.conf      | 2 +-
>>   3 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
>> index 9bcf559..634a666 100644
>> --- a/conf/distro/cip-core-bookworm.conf
>> +++ b/conf/distro/cip-core-bookworm.conf
>> @@ -12,6 +12,7 @@
>>   require conf/distro/debian-bookworm.conf
>>   require cip-core-common.inc
>>   
>> -PREFERRED_VERSION_swupdate ?= "2023.05%"
>> +PREFERRED_VERSION_swupdate ?= "2023.12%"
>> +PREFERRED_VERSION_libubootenv-dev ?= "0.3.5%"
> 
> This line is not explained - is it actually related?
It was related - I will send a v2 to drop it.

Quirin
> 
> Jan
> 
>>   PREFERRED_VERSION_linux-cip ?= "6.1.%"
>>   PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
>> diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf
>> index 4f26299..110f334 100644
>> --- a/conf/distro/cip-core-bullseye.conf
>> +++ b/conf/distro/cip-core-bullseye.conf
>> @@ -15,6 +15,6 @@ require cip-core-common.inc
>>   DISTRO_APT_SOURCES:append:swupdate = " conf/distro/debian-bullseye-backports.list"
>>   DISTRO_APT_PREFERENCES:append:swupdate = " conf/distro/preferences.swupdate-bullseye-backports.conf"
>>   
>> -PREFERRED_VERSION_swupdate ?= "2023.05%"
>> +PREFERRED_VERSION_swupdate ?= "2023.12%"
>>   PREFERRED_VERSION_linux-cip ?= "5.10.%"
>>   PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
>> diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
>> index aff4572..692c105 100644
>> --- a/conf/distro/cip-core-sid.conf
>> +++ b/conf/distro/cip-core-sid.conf
>> @@ -15,6 +15,6 @@ require cip-core-common.inc
>>   DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
>>   HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
>>   
>> -PREFERRED_VERSION_swupdate ?= "2023.05%"
>> +PREFERRED_VERSION_swupdate ?= "2023.12%"
>>   PREFERRED_VERSION_linux-cip ?= "6.1.%"
>>   PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
>
diff mbox series

Patch

diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
index 9bcf559..634a666 100644
--- a/conf/distro/cip-core-bookworm.conf
+++ b/conf/distro/cip-core-bookworm.conf
@@ -12,6 +12,7 @@ 
 require conf/distro/debian-bookworm.conf
 require cip-core-common.inc
 
-PREFERRED_VERSION_swupdate ?= "2023.05%"
+PREFERRED_VERSION_swupdate ?= "2023.12%"
+PREFERRED_VERSION_libubootenv-dev ?= "0.3.5%"
 PREFERRED_VERSION_linux-cip ?= "6.1.%"
 PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf
index 4f26299..110f334 100644
--- a/conf/distro/cip-core-bullseye.conf
+++ b/conf/distro/cip-core-bullseye.conf
@@ -15,6 +15,6 @@  require cip-core-common.inc
 DISTRO_APT_SOURCES:append:swupdate = " conf/distro/debian-bullseye-backports.list"
 DISTRO_APT_PREFERENCES:append:swupdate = " conf/distro/preferences.swupdate-bullseye-backports.conf"
 
-PREFERRED_VERSION_swupdate ?= "2023.05%"
+PREFERRED_VERSION_swupdate ?= "2023.12%"
 PREFERRED_VERSION_linux-cip ?= "5.10.%"
 PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
index aff4572..692c105 100644
--- a/conf/distro/cip-core-sid.conf
+++ b/conf/distro/cip-core-sid.conf
@@ -15,6 +15,6 @@  require cip-core-common.inc
 DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
 HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
 
-PREFERRED_VERSION_swupdate ?= "2023.05%"
+PREFERRED_VERSION_swupdate ?= "2023.12%"
 PREFERRED_VERSION_linux-cip ?= "6.1.%"
 PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"