@@ -62,7 +62,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" ]; then base_yaml="${base_yaml}:kas/opt/sid.yml"; fi
+ - if [ "${release}" = "trixie" ]; then base_yaml="${base_yaml}:kas/opt/trixie.yml"; fi
- if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-data.yml"; fi
- if [ "${swupdate_version}" = "2022.12" ]; then base_yaml="${base_yaml}:kas/opt/swupdate-2022.12.yaml"; fi
- echo "Building ${base_yaml}"
@@ -333,13 +333,13 @@ build:qemu-amd64-secure-boot-buster:
deploy: disable
encrypt: enable
-# riscv64 (sid)
+# trixie images
build:qemu-riscv64:
extends:
- .build_base
variables:
target: qemu-riscv64
- release: sid
+ release: trixie
use_rt: disable
targz: disable
deploy: disable
@@ -139,10 +139,6 @@ config DEBIAN_BOOKWORM
config DEBIAN_TRIXIE
bool "trixie (testing)"
-config DEBIAN_SID
- bool "sid (unstable)"
- depends on ARCH_RISCV64
-
endchoice
config KAS_INCLUDE_DEBIAN
@@ -151,7 +147,6 @@ config KAS_INCLUDE_DEBIAN
default "kas/opt/bullseye.yml" if DEBIAN_BULLSEYE
default "kas/opt/bookworm.yml" if DEBIAN_BOOKWORM
default "kas/opt/trixie.yml" if DEBIAN_TRIXIE
- default "kas/opt/sid.yml" if DEBIAN_SID
comment "Image features"
@@ -27,8 +27,8 @@ python () {
if d.getVar("DELTA_RDIFF_REF_IMAGE") == "":
bb.fatal("You must set DELTA_RDIFF_REF_IMAGE and provide the required files as artifacts to this recipe")
elif d.getVar("DELTA_UPDATE_TYPE") == "zchunk":
- if d.getVar("BASE_DISTRO_CODENAME") != "sid":
- bb.fatal("Zchunk based delta update is only supported from sid")
+ if d.getVar("BASE_DISTRO_CODENAME") != "trixie":
+ bb.fatal("Zchunk based delta update is only supported from trixie onward")
else:
disable_delta_update_tasks(d)
}
deleted file mode 100644
@@ -1,20 +0,0 @@
-#
-# 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
-
-# corresponds to 20240211T000000Z
-ISAR_APT_SNAPSHOT_TIMESTAMP ?= "1707606000"
-ISAR_USE_APT_SNAPSHOT ?= "1"
-
-PREFERRED_VERSION_linux-cip ?= "6.1.%"
-PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
@@ -435,27 +435,27 @@ host$ scp -P 22222 ./cip-core-image-cip-core-bookworm-qemu-amd64.swu root@localh
## Delta Software Update using zchunk handler
-Currently zchunk based delta updates are supported only in Sid images. Make sure to build the first image with Sid as the distribution with the following command:
+Currently zchunk based delta updates are supported only in trixie images. Make sure to build the first image with trixie as the distribution with the following command:
```
-host$ ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-swu.yml:kas/opt/sid.yml
+host$ ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-swu.yml:kas/opt/trixie.yml
```
For Delta update with zchunk, set the variable `DELTA_ZCK_URL` with the URL of the zck file that is hosted in a http server and set the `DELTA_UPDATE_TYPE` to `zchunk` in `delta-update.yml` file.
Build the second image with the modification as shown above with the following command:
```
-KAS_BUILD_DIR=build-v2 ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-swu.yml:kas/opt/sid.yml:kas/opt/delta-update.yml
+KAS_BUILD_DIR=build-v2 ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/ebg-swu.yml:kas/opt/trixie.yml:kas/opt/delta-update.yml
```
Now start the first image. Run the following commands:
```
-host$ DISTRO_RELEASE=sid SWUPDATE_BOOT=y ./start-qemu.sh amd64
+host$ DISTRO_RELEASE=trixie SWUPDATE_BOOT=y ./start-qemu.sh amd64
```
-Copy `cip-core-image-cip-core-sid-qemu-amd64.swu` file from `build-v2/tmp/deploy/images/qemu-amd64/` folder into the running system:
+Copy `cip-core-image-cip-core-trixie-qemu-amd64.swu` file from `build-v2/tmp/deploy/images/qemu-amd64/` folder into the running system:
```
host$ cd build-v2/tmp/deploy/images/qemu-amd64/
-host$ scp -P 22222 ./cip-core-image-cip-core-sid-qemu-amd64.swu root@localhost:
+host$ scp -P 22222 ./cip-core-image-cip-core-trixie-qemu-amd64.swu root@localhost:
```
-The `cip-core-image-cip-core-sid-qemu-amd64.zck` file must be hosted in a http server.
-Any http server (service) can be used to host the .zck file as long as the http server supports http range requests. Copy the `build-v2/tmp/deploy/images/qemu-amd64/cip-core-image-cip-core-sid-qemu-amd64.zck` to the server directory. For more information on the integration of zchunk handler in swupdate, refer the [documentation](https://sbabic.github.io/swupdate/delta-update.html#integration-in-swupdate-the-delta-handler)
+The `cip-core-image-cip-core-trixie-qemu-amd64.zck` file must be hosted in a http server.
+Any http server (service) can be used to host the .zck file as long as the http server supports http range requests. Copy the `build-v2/tmp/deploy/images/qemu-amd64/cip-core-image-cip-core-trixie-qemu-amd64.zck` to the server directory. For more information on the integration of zchunk handler in swupdate, refer the [documentation](https://sbabic.github.io/swupdate/delta-update.html#integration-in-swupdate-the-delta-handler)
## Delta Software Update Verification
deleted file mode 100644
@@ -1,15 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2022-2024
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-header:
- version: 14
-
-distro: cip-core-sid
@@ -39,7 +39,6 @@ DEPENDS:bullseye = "python-shtab"
DEPENDS:bookworm = "python-shtab"
DEPENDS:trixie = "gnu-efi"
-DEPENDS:sid = "gnu-efi"
# needed for buster, bullseye could use compat >= 13
python() {
@@ -40,9 +40,7 @@ if [ -n "${QEMU_PATH}" ]; then
fi
if [ -z "${DISTRO_RELEASE}" ]; then
- if grep -s -q "DEBIAN_SID: true" .config.yaml; then
- DISTRO_RELEASE="sid"
- elif grep -s -q "DEBIAN_BUSTER: true" .config.yaml; then
+ if grep -s -q "DEBIAN_BUSTER: true" .config.yaml; then
DISTRO_RELEASE="buster"
elif grep -s -q "DEBIAN_BOOKWORM: true" .config.yaml; then
DISTRO_RELEASE="bookworm"