diff mbox series

[isar-cip-core] Migrate RISC-V support to Debian sid

Message ID 1cd81bc4-a52e-4dcb-9ff6-48b163bd6edd@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] Migrate RISC-V support to Debian sid | expand

Commit Message

Jan Kiszka Jan. 11, 2024, 1:51 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

With the promotion of riscv64 to an official port, building from
sid+sid-ports became broken long ago. Then cross-building from sid was
broken, but this has been fixed recently, and the release team is also
trying to keep it working. So it's time for us to migrate our
qemu-riscv64 to this new configuration.

We keep the "allow_failure" in CI as we are still building against
unstable, though. That may change once things move on into trixie.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .gitlab-ci.yml                                |  8 ++++----
 Kconfig                                       |  8 ++++----
 conf/distro/cip-core-sid-ports.conf           | 20 -------------------
 conf/distro/cip-core-sid.conf                 | 17 ++++++++++++++++
 .../distro/cip-debian-sid-ports-snapshot.list |  2 --
 conf/distro/cip-debian-sid-snapshot.list      |  2 --
 kas/opt/{sid-ports.yml => sid.yml}            |  4 ++--
 .../secure-boot-secrets/files/sid-ports       |  1 -
 .../swupdate-certificates/files/sid-ports     |  1 -
 start-qemu.sh                                 |  6 +++---
 10 files changed, 30 insertions(+), 39 deletions(-)
 delete mode 100644 conf/distro/cip-core-sid-ports.conf
 create mode 100644 conf/distro/cip-core-sid.conf
 delete mode 100644 conf/distro/cip-debian-sid-ports-snapshot.list
 delete mode 100644 conf/distro/cip-debian-sid-snapshot.list
 rename kas/opt/{sid-ports.yml => sid.yml} (70%)
 delete mode 120000 recipes-devtools/secure-boot-secrets/files/sid-ports
 delete mode 120000 recipes-devtools/swupdate-certificates/files/sid-ports

Comments

Jan Kiszka Jan. 11, 2024, 2:47 p.m. UTC | #1 
On 11.01.24 14:51, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> With the promotion of riscv64 to an official port, building from
> sid+sid-ports became broken long ago. Then cross-building from sid was
> broken, but this has been fixed recently, and the release team is also
> trying to keep it working. So it's time for us to migrate our
> qemu-riscv64 to this new configuration.
> 
> We keep the "allow_failure" in CI as we are still building against
> unstable, though. That may change once things move on into trixie.
> 

To set expectations: SWUpdate does not build for sid right now, thus the
related image variante does not work again. That likely also means that
even the Debian version of SWUpdate in sid will likely not install due
to version mismatches. Would that version otherwise work, Quirin?

Jan

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  .gitlab-ci.yml                                |  8 ++++----
>  Kconfig                                       |  8 ++++----
>  conf/distro/cip-core-sid-ports.conf           | 20 -------------------
>  conf/distro/cip-core-sid.conf                 | 17 ++++++++++++++++
>  .../distro/cip-debian-sid-ports-snapshot.list |  2 --
>  conf/distro/cip-debian-sid-snapshot.list      |  2 --
>  kas/opt/{sid-ports.yml => sid.yml}            |  4 ++--
>  .../secure-boot-secrets/files/sid-ports       |  1 -
>  .../swupdate-certificates/files/sid-ports     |  1 -
>  start-qemu.sh                                 |  6 +++---
>  10 files changed, 30 insertions(+), 39 deletions(-)
>  delete mode 100644 conf/distro/cip-core-sid-ports.conf
>  create mode 100644 conf/distro/cip-core-sid.conf
>  delete mode 100644 conf/distro/cip-debian-sid-ports-snapshot.list
>  delete mode 100644 conf/distro/cip-debian-sid-snapshot.list
>  rename kas/opt/{sid-ports.yml => sid.yml} (70%)
>  delete mode 120000 recipes-devtools/secure-boot-secrets/files/sid-ports
>  delete mode 120000 recipes-devtools/swupdate-certificates/files/sid-ports
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 1de6570b..81a31c5e 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2019-2023
> +# Copyright (c) Siemens AG, 2019-2024
>  # Copyright (c) Toshiba Corporation, 2020
>  #
>  # Authors:
> @@ -56,7 +56,7 @@ default:
>      - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi
>      - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi
>      - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
> -    - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi
> +    - if [ "${release}" = "sid" ]; then base_yaml="${base_yaml}:kas/opt/sid.yml"; fi
>      - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-partitions.yml"; fi
>      - echo "Building ${base_yaml}"
>      - kas build ${base_yaml}
> @@ -329,13 +329,13 @@ build:qemu-amd64-secure-boot-buster:
>      deploy: disable
>      encrypt: enable
>  
> -# riscv64 (sid-ports)
> +# riscv64 (sid)
>  build:qemu-riscv64:
>    extends:
>      - .build_base
>    variables:
>      target: qemu-riscv64
> -    release: sid-ports
> +    release: sid
>      use_rt: disable
>      wic_targz: disable
>      deploy: disable
> diff --git a/Kconfig b/Kconfig
> index f5ea5aff..d0dc13b1 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2021-2022
> +# Copyright (c) Siemens AG, 2021-2024
>  #
>  # Authors:
>  #  Jan Kiszka <jan.kiszka@siemens.com>
> @@ -136,8 +136,8 @@ config DEBIAN_BOOKWORM
>  	bool "bookworm (12)"
>  	depends on !ARCH_RISCV64
>  
> -config DEBIAN_SID_PORTS
> -	bool "sid (unstable) with unofficial ports"
> +config DEBIAN_SID
> +	bool "sid (unstable)"
>  	depends on ARCH_RISCV64
>  
>  endchoice
> @@ -147,7 +147,7 @@ config KAS_INCLUDE_DEBIAN
>  	default "kas/opt/buster.yml" if DEBIAN_BUSTER
>  	default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
>  	default "kas/opt/bookworm.yml" if DEBIAN_BOOKWORM
> -	default "kas/opt/sid-ports.yml" if DEBIAN_SID_PORTS
> +	default "kas/opt/sid.yml" if DEBIAN_SID
>  
>  comment "Image features"
>  
> diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf
> deleted file mode 100644
> index 2e74af73..00000000
> --- a/conf/distro/cip-core-sid-ports.conf
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#
> -# CIP Core, generic profile
> -#
> -# Copyright (c) Siemens AG, 2022-2023
> -#
> -# Authors:
> -#  Jan Kiszka <jan.kiszka@siemens.com>
> -#
> -# SPDX-License-Identifier: MIT
> -#
> -
> -require conf/distro/debian-sid-ports.conf
> -require cip-core-common.inc
> -
> -PREFERRED_VERSION_linux-cip ?= "5.10.%"
> -PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
> -PREFERRED_VERSION_swupdate ?= "2023.05%"
> -
> -DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-ports-snapshot.list"
> -HOST_DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list ${DISTRO_APT_SOURCES}"
> diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
> new file mode 100644
> index 00000000..028b6c00
> --- /dev/null
> +++ b/conf/distro/cip-core-sid.conf
> @@ -0,0 +1,17 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2022-2024
> +#
> +# Authors:
> +#  Jan Kiszka <jan.kiszka@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require conf/distro/debian-sid.conf
> +require cip-core-common.inc
> +
> +PREFERRED_VERSION_swupdate ?= "2023.05%"
> +PREFERRED_VERSION_linux-cip ?= "6.1.%"
> +PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
> diff --git a/conf/distro/cip-debian-sid-ports-snapshot.list b/conf/distro/cip-debian-sid-ports-snapshot.list
> deleted file mode 100644
> index bd08a742..00000000
> --- a/conf/distro/cip-debian-sid-ports-snapshot.list
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -deb	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian-ports/20230430T091331Z sid main
> -deb-src	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
> diff --git a/conf/distro/cip-debian-sid-snapshot.list b/conf/distro/cip-debian-sid-snapshot.list
> deleted file mode 100644
> index 87e0b95b..00000000
> --- a/conf/distro/cip-debian-sid-snapshot.list
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -deb	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
> -deb-src	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
> diff --git a/kas/opt/sid-ports.yml b/kas/opt/sid.yml
> similarity index 70%
> rename from kas/opt/sid-ports.yml
> rename to kas/opt/sid.yml
> index b11a1c2b..be2eeb47 100644
> --- a/kas/opt/sid-ports.yml
> +++ b/kas/opt/sid.yml
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2022
> +# Copyright (c) Siemens AG, 2022-2024
>  #
>  # Authors:
>  #  Jan Kiszka <jan.kiszka@siemens.com>
> @@ -12,4 +12,4 @@
>  header:
>    version: 14
>  
> -distro: cip-core-sid-ports
> +distro: cip-core-sid
> diff --git a/recipes-devtools/secure-boot-secrets/files/sid-ports b/recipes-devtools/secure-boot-secrets/files/sid-ports
> deleted file mode 120000
> index 91bf492f..00000000
> --- a/recipes-devtools/secure-boot-secrets/files/sid-ports
> +++ /dev/null
> @@ -1 +0,0 @@
> -bullseye
> \ No newline at end of file
> diff --git a/recipes-devtools/swupdate-certificates/files/sid-ports b/recipes-devtools/swupdate-certificates/files/sid-ports
> deleted file mode 120000
> index 7d00e075..00000000
> --- a/recipes-devtools/swupdate-certificates/files/sid-ports
> +++ /dev/null
> @@ -1 +0,0 @@
> -../../secure-boot-secrets/files/sid-ports
> \ No newline at end of file
> diff --git a/start-qemu.sh b/start-qemu.sh
> index b6f9d012..080f939c 100755
> --- a/start-qemu.sh
> +++ b/start-qemu.sh
> @@ -2,7 +2,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2019
> +# Copyright (c) Siemens AG, 2019-2024
>  #
>  # Authors:
>  #  Jan Kiszka <jan.kiszka@siemens.com>
> @@ -40,8 +40,8 @@ if [ -n "${QEMU_PATH}" ]; then
>  fi
>  
>  if [ -z "${DISTRO_RELEASE}" ]; then
> -	if grep -s -q "DEBIAN_SID_PORTS: true" .config.yaml; then
> -		DISTRO_RELEASE="sid-ports"
> +	if grep -s -q "DEBIAN_SID: true" .config.yaml; then
> +		DISTRO_RELEASE="sid"
>  	elif grep -s -q "DEBIAN_BUSTER: true" .config.yaml; then
>  		DISTRO_RELEASE="buster"
>  	elif grep -s -q "DEBIAN_BOOKWORM: true" .config.yaml; then
Gylstorff Quirin Jan. 11, 2024, 8:18 p.m. UTC | #2 
On 1/11/24 15:47, Jan Kiszka wrote:
> On 11.01.24 14:51, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> With the promotion of riscv64 to an official port, building from
>> sid+sid-ports became broken long ago. Then cross-building from sid was
>> broken, but this has been fixed recently, and the release team is also
>> trying to keep it working. So it's time for us to migrate our
>> qemu-riscv64 to this new configuration.
>>
>> We keep the "allow_failure" in CI as we are still building against
>> unstable, though. That may change once things move on into trixie.
>>
> 
> To set expectations: SWUpdate does not build for sid right now, thus the
> related image variante does not work again. That likely also means that
> even the Debian version of SWUpdate in sid will likely not install due
> to version mismatches. Would that version otherwise work, Quirin?

I am not sure but sid use SWUpdate 2023.12 already I can check it the 
patch on my integration branch.

Quirin

> 
> Jan
> 
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   .gitlab-ci.yml                                |  8 ++++----
>>   Kconfig                                       |  8 ++++----
>>   conf/distro/cip-core-sid-ports.conf           | 20 -------------------
>>   conf/distro/cip-core-sid.conf                 | 17 ++++++++++++++++
>>   .../distro/cip-debian-sid-ports-snapshot.list |  2 --
>>   conf/distro/cip-debian-sid-snapshot.list      |  2 --
>>   kas/opt/{sid-ports.yml => sid.yml}            |  4 ++--
>>   .../secure-boot-secrets/files/sid-ports       |  1 -
>>   .../swupdate-certificates/files/sid-ports     |  1 -
>>   start-qemu.sh                                 |  6 +++---
>>   10 files changed, 30 insertions(+), 39 deletions(-)
>>   delete mode 100644 conf/distro/cip-core-sid-ports.conf
>>   create mode 100644 conf/distro/cip-core-sid.conf
>>   delete mode 100644 conf/distro/cip-debian-sid-ports-snapshot.list
>>   delete mode 100644 conf/distro/cip-debian-sid-snapshot.list
>>   rename kas/opt/{sid-ports.yml => sid.yml} (70%)
>>   delete mode 120000 recipes-devtools/secure-boot-secrets/files/sid-ports
>>   delete mode 120000 recipes-devtools/swupdate-certificates/files/sid-ports
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index 1de6570b..81a31c5e 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -1,7 +1,7 @@
>>   #
>>   # CIP Core, generic profile
>>   #
>> -# Copyright (c) Siemens AG, 2019-2023
>> +# Copyright (c) Siemens AG, 2019-2024
>>   # Copyright (c) Toshiba Corporation, 2020
>>   #
>>   # Authors:
>> @@ -56,7 +56,7 @@ default:
>>       - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi
>>       - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi
>>       - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
>> -    - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi
>> +    - if [ "${release}" = "sid" ]; then base_yaml="${base_yaml}:kas/opt/sid.yml"; fi
>>       - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-partitions.yml"; fi
>>       - echo "Building ${base_yaml}"
>>       - kas build ${base_yaml}
>> @@ -329,13 +329,13 @@ build:qemu-amd64-secure-boot-buster:
>>       deploy: disable
>>       encrypt: enable
>>   
>> -# riscv64 (sid-ports)
>> +# riscv64 (sid)
>>   build:qemu-riscv64:
>>     extends:
>>       - .build_base
>>     variables:
>>       target: qemu-riscv64
>> -    release: sid-ports
>> +    release: sid
>>       use_rt: disable
>>       wic_targz: disable
>>       deploy: disable
>> diff --git a/Kconfig b/Kconfig
>> index f5ea5aff..d0dc13b1 100644
>> --- a/Kconfig
>> +++ b/Kconfig
>> @@ -1,7 +1,7 @@
>>   #
>>   # CIP Core, generic profile
>>   #
>> -# Copyright (c) Siemens AG, 2021-2022
>> +# Copyright (c) Siemens AG, 2021-2024
>>   #
>>   # Authors:
>>   #  Jan Kiszka <jan.kiszka@siemens.com>
>> @@ -136,8 +136,8 @@ config DEBIAN_BOOKWORM
>>   	bool "bookworm (12)"
>>   	depends on !ARCH_RISCV64
>>   
>> -config DEBIAN_SID_PORTS
>> -	bool "sid (unstable) with unofficial ports"
>> +config DEBIAN_SID
>> +	bool "sid (unstable)"
>>   	depends on ARCH_RISCV64
>>   
>>   endchoice
>> @@ -147,7 +147,7 @@ config KAS_INCLUDE_DEBIAN
>>   	default "kas/opt/buster.yml" if DEBIAN_BUSTER
>>   	default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
>>   	default "kas/opt/bookworm.yml" if DEBIAN_BOOKWORM
>> -	default "kas/opt/sid-ports.yml" if DEBIAN_SID_PORTS
>> +	default "kas/opt/sid.yml" if DEBIAN_SID
>>   
>>   comment "Image features"
>>   
>> diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf
>> deleted file mode 100644
>> index 2e74af73..00000000
>> --- a/conf/distro/cip-core-sid-ports.conf
>> +++ /dev/null
>> @@ -1,20 +0,0 @@
>> -#
>> -# CIP Core, generic profile
>> -#
>> -# Copyright (c) Siemens AG, 2022-2023
>> -#
>> -# Authors:
>> -#  Jan Kiszka <jan.kiszka@siemens.com>
>> -#
>> -# SPDX-License-Identifier: MIT
>> -#
>> -
>> -require conf/distro/debian-sid-ports.conf
>> -require cip-core-common.inc
>> -
>> -PREFERRED_VERSION_linux-cip ?= "5.10.%"
>> -PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
>> -PREFERRED_VERSION_swupdate ?= "2023.05%"
>> -
>> -DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-ports-snapshot.list"
>> -HOST_DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list ${DISTRO_APT_SOURCES}"
>> diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
>> new file mode 100644
>> index 00000000..028b6c00
>> --- /dev/null
>> +++ b/conf/distro/cip-core-sid.conf
>> @@ -0,0 +1,17 @@
>> +#
>> +# CIP Core, generic profile
>> +#
>> +# Copyright (c) Siemens AG, 2022-2024
>> +#
>> +# Authors:
>> +#  Jan Kiszka <jan.kiszka@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +require conf/distro/debian-sid.conf
>> +require cip-core-common.inc
>> +
>> +PREFERRED_VERSION_swupdate ?= "2023.05%"
>> +PREFERRED_VERSION_linux-cip ?= "6.1.%"
>> +PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
>> diff --git a/conf/distro/cip-debian-sid-ports-snapshot.list b/conf/distro/cip-debian-sid-ports-snapshot.list
>> deleted file mode 100644
>> index bd08a742..00000000
>> --- a/conf/distro/cip-debian-sid-ports-snapshot.list
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -deb	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian-ports/20230430T091331Z sid main
>> -deb-src	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
>> diff --git a/conf/distro/cip-debian-sid-snapshot.list b/conf/distro/cip-debian-sid-snapshot.list
>> deleted file mode 100644
>> index 87e0b95b..00000000
>> --- a/conf/distro/cip-debian-sid-snapshot.list
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -deb	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
>> -deb-src	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
>> diff --git a/kas/opt/sid-ports.yml b/kas/opt/sid.yml
>> similarity index 70%
>> rename from kas/opt/sid-ports.yml
>> rename to kas/opt/sid.yml
>> index b11a1c2b..be2eeb47 100644
>> --- a/kas/opt/sid-ports.yml
>> +++ b/kas/opt/sid.yml
>> @@ -1,7 +1,7 @@
>>   #
>>   # CIP Core, generic profile
>>   #
>> -# Copyright (c) Siemens AG, 2022
>> +# Copyright (c) Siemens AG, 2022-2024
>>   #
>>   # Authors:
>>   #  Jan Kiszka <jan.kiszka@siemens.com>
>> @@ -12,4 +12,4 @@
>>   header:
>>     version: 14
>>   
>> -distro: cip-core-sid-ports
>> +distro: cip-core-sid
>> diff --git a/recipes-devtools/secure-boot-secrets/files/sid-ports b/recipes-devtools/secure-boot-secrets/files/sid-ports
>> deleted file mode 120000
>> index 91bf492f..00000000
>> --- a/recipes-devtools/secure-boot-secrets/files/sid-ports
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -bullseye
>> \ No newline at end of file
>> diff --git a/recipes-devtools/swupdate-certificates/files/sid-ports b/recipes-devtools/swupdate-certificates/files/sid-ports
>> deleted file mode 120000
>> index 7d00e075..00000000
>> --- a/recipes-devtools/swupdate-certificates/files/sid-ports
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -../../secure-boot-secrets/files/sid-ports
>> \ No newline at end of file
>> diff --git a/start-qemu.sh b/start-qemu.sh
>> index b6f9d012..080f939c 100755
>> --- a/start-qemu.sh
>> +++ b/start-qemu.sh
>> @@ -2,7 +2,7 @@
>>   #
>>   # CIP Core, generic profile
>>   #
>> -# Copyright (c) Siemens AG, 2019
>> +# Copyright (c) Siemens AG, 2019-2024
>>   #
>>   # Authors:
>>   #  Jan Kiszka <jan.kiszka@siemens.com>
>> @@ -40,8 +40,8 @@ if [ -n "${QEMU_PATH}" ]; then
>>   fi
>>   
>>   if [ -z "${DISTRO_RELEASE}" ]; then
>> -	if grep -s -q "DEBIAN_SID_PORTS: true" .config.yaml; then
>> -		DISTRO_RELEASE="sid-ports"
>> +	if grep -s -q "DEBIAN_SID: true" .config.yaml; then
>> +		DISTRO_RELEASE="sid"
>>   	elif grep -s -q "DEBIAN_BUSTER: true" .config.yaml; then
>>   		DISTRO_RELEASE="buster"
>>   	elif grep -s -q "DEBIAN_BOOKWORM: true" .config.yaml; then
>
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1de6570b..81a31c5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2019-2023
+# Copyright (c) Siemens AG, 2019-2024
 # Copyright (c) Toshiba Corporation, 2020
 #
 # Authors:
@@ -56,7 +56,7 @@  default:
     - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi
     - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
-    - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi
+    - if [ "${release}" = "sid" ]; then base_yaml="${base_yaml}:kas/opt/sid.yml"; fi
     - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-partitions.yml"; fi
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
@@ -329,13 +329,13 @@  build:qemu-amd64-secure-boot-buster:
     deploy: disable
     encrypt: enable
 
-# riscv64 (sid-ports)
+# riscv64 (sid)
 build:qemu-riscv64:
   extends:
     - .build_base
   variables:
     target: qemu-riscv64
-    release: sid-ports
+    release: sid
     use_rt: disable
     wic_targz: disable
     deploy: disable
diff --git a/Kconfig b/Kconfig
index f5ea5aff..d0dc13b1 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2021-2022
+# Copyright (c) Siemens AG, 2021-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -136,8 +136,8 @@  config DEBIAN_BOOKWORM
 	bool "bookworm (12)"
 	depends on !ARCH_RISCV64
 
-config DEBIAN_SID_PORTS
-	bool "sid (unstable) with unofficial ports"
+config DEBIAN_SID
+	bool "sid (unstable)"
 	depends on ARCH_RISCV64
 
 endchoice
@@ -147,7 +147,7 @@  config KAS_INCLUDE_DEBIAN
 	default "kas/opt/buster.yml" if DEBIAN_BUSTER
 	default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
 	default "kas/opt/bookworm.yml" if DEBIAN_BOOKWORM
-	default "kas/opt/sid-ports.yml" if DEBIAN_SID_PORTS
+	default "kas/opt/sid.yml" if DEBIAN_SID
 
 comment "Image features"
 
diff --git a/conf/distro/cip-core-sid-ports.conf b/conf/distro/cip-core-sid-ports.conf
deleted file mode 100644
index 2e74af73..00000000
--- a/conf/distro/cip-core-sid-ports.conf
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2022-2023
-#
-# Authors:
-#  Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require conf/distro/debian-sid-ports.conf
-require cip-core-common.inc
-
-PREFERRED_VERSION_linux-cip ?= "5.10.%"
-PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
-PREFERRED_VERSION_swupdate ?= "2023.05%"
-
-DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-ports-snapshot.list"
-HOST_DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list ${DISTRO_APT_SOURCES}"
diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
new file mode 100644
index 00000000..028b6c00
--- /dev/null
+++ b/conf/distro/cip-core-sid.conf
@@ -0,0 +1,17 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2022-2024
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require conf/distro/debian-sid.conf
+require cip-core-common.inc
+
+PREFERRED_VERSION_swupdate ?= "2023.05%"
+PREFERRED_VERSION_linux-cip ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
diff --git a/conf/distro/cip-debian-sid-ports-snapshot.list b/conf/distro/cip-debian-sid-ports-snapshot.list
deleted file mode 100644
index bd08a742..00000000
--- a/conf/distro/cip-debian-sid-ports-snapshot.list
+++ /dev/null
@@ -1,2 +0,0 @@ 
-deb	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian-ports/20230430T091331Z sid main
-deb-src	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
diff --git a/conf/distro/cip-debian-sid-snapshot.list b/conf/distro/cip-debian-sid-snapshot.list
deleted file mode 100644
index 87e0b95b..00000000
--- a/conf/distro/cip-debian-sid-snapshot.list
+++ /dev/null
@@ -1,2 +0,0 @@ 
-deb	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
-deb-src	[check-valid-until=no trusted=yes] https://snapshot.debian.org/archive/debian/20230430T091331Z sid main
diff --git a/kas/opt/sid-ports.yml b/kas/opt/sid.yml
similarity index 70%
rename from kas/opt/sid-ports.yml
rename to kas/opt/sid.yml
index b11a1c2b..be2eeb47 100644
--- a/kas/opt/sid-ports.yml
+++ b/kas/opt/sid.yml
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2022
+# Copyright (c) Siemens AG, 2022-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -12,4 +12,4 @@ 
 header:
   version: 14
 
-distro: cip-core-sid-ports
+distro: cip-core-sid
diff --git a/recipes-devtools/secure-boot-secrets/files/sid-ports b/recipes-devtools/secure-boot-secrets/files/sid-ports
deleted file mode 120000
index 91bf492f..00000000
--- a/recipes-devtools/secure-boot-secrets/files/sid-ports
+++ /dev/null
@@ -1 +0,0 @@ 
-bullseye
\ No newline at end of file
diff --git a/recipes-devtools/swupdate-certificates/files/sid-ports b/recipes-devtools/swupdate-certificates/files/sid-ports
deleted file mode 120000
index 7d00e075..00000000
--- a/recipes-devtools/swupdate-certificates/files/sid-ports
+++ /dev/null
@@ -1 +0,0 @@ 
-../../secure-boot-secrets/files/sid-ports
\ No newline at end of file
diff --git a/start-qemu.sh b/start-qemu.sh
index b6f9d012..080f939c 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -2,7 +2,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -40,8 +40,8 @@  if [ -n "${QEMU_PATH}" ]; then
 fi
 
 if [ -z "${DISTRO_RELEASE}" ]; then
-	if grep -s -q "DEBIAN_SID_PORTS: true" .config.yaml; then
-		DISTRO_RELEASE="sid-ports"
+	if grep -s -q "DEBIAN_SID: true" .config.yaml; then
+		DISTRO_RELEASE="sid"
 	elif grep -s -q "DEBIAN_BUSTER: true" .config.yaml; then
 		DISTRO_RELEASE="buster"
 	elif grep -s -q "DEBIAN_BOOKWORM: true" .config.yaml; then