* [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12
@ 2023-03-10 18:20 Quirin Gylstorff
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm) Quirin Gylstorff
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Quirin Gylstorff @ 2023-03-10 18:20 UTC (permalink / raw)
To: felix.moessbauer, cip-dev, jan.kiszka
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Add ci builds for bookworm
Change efibootguard build to use debian folder from salsa
Changes v2:
- rebase onto next
- always build efibootguard
Quirin Gylstorff (2):
Enable Images based on Debian 12 (bookworm)
efibootguard: use debian folder from salsa
.gitlab-ci.yml | 45 +++++++++++++++++++
Kconfig | 5 +++
conf/distro/cip-core-bookworm.conf | 16 +++++++
kas/opt/bookworm.yml | 15 +++++++
...guard_0.13.bb => efibootguard_0.13+cip.bb} | 31 +++++++------
...l-Make-compatible-with-debian-buster.patch | 36 +++++++++++++++
...rol-remove-native-from-python3-shtab.patch | 26 +++++++++++
recipes-bsp/efibootguard/files/debian/compat | 1 -
.../efibootguard/files/debian/control.tmpl | 20 ---------
.../debian/efibootguard-dev.install.tmpl | 2 -
.../files/debian/efibootguard.install | 5 ---
recipes-bsp/efibootguard/files/debian/rules | 15 -------
...01-add-machine-type-name-for-riscv64.patch | 0
recipes-core/images/efibootguard.inc | 1 -
recipes-core/images/swupdate.inc | 6 ++-
recipes-core/swupdate/swupdate.inc | 2 +-
16 files changed, 167 insertions(+), 59 deletions(-)
create mode 100644 conf/distro/cip-core-bookworm.conf
create mode 100644 kas/opt/bookworm.yml
rename recipes-bsp/efibootguard/{efibootguard_0.13.bb => efibootguard_0.13+cip.bb} (53%)
create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
delete mode 100644 recipes-bsp/efibootguard/files/debian/compat
delete mode 100644 recipes-bsp/efibootguard/files/debian/control.tmpl
delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard.install
delete mode 100755 recipes-bsp/efibootguard/files/debian/rules
rename recipes-bsp/efibootguard/files/{ => src-patches}/0001-add-machine-type-name-for-riscv64.patch (100%)
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm)
2023-03-10 18:20 [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Quirin Gylstorff
@ 2023-03-10 18:20 ` Quirin Gylstorff
2023-04-13 20:43 ` Jan Kiszka
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 2/2] efibootguard: use debian folder from salsa Quirin Gylstorff
2023-03-13 9:36 ` [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Jan Kiszka
2 siblings, 1 reply; 6+ messages in thread
From: Quirin Gylstorff @ 2023-03-10 18:20 UTC (permalink / raw)
To: felix.moessbauer, cip-dev, jan.kiszka
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This will add prelimitary support for the debian 12 aka bookworm.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
.gitlab-ci.yml | 45 ++++++++++++++++++++++++++++
Kconfig | 5 ++++
conf/distro/cip-core-bookworm.conf | 16 ++++++++++
kas/opt/bookworm.yml | 15 ++++++++++
recipes-core/images/efibootguard.inc | 4 +++
recipes-core/images/swupdate.inc | 6 +++-
6 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 conf/distro/cip-core-bookworm.conf
create mode 100644 kas/opt/bookworm.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f51b64b..be1d8d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,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}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi
+ - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
- echo "Building ${base_yaml}"
- kas build ${base_yaml}
- if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
@@ -312,3 +313,47 @@ build:qemu-riscv64:
deploy: disable
include: '.reproducible-check-ci.yml'
+
+# bookworm images
+build:simatic-ipc227e-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: simatic-ipc227e
+ release: bookworm
+
+build:bbb-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: bbb
+ dtb: am335x-boneblack.dtb
+ release: bookworm
+
+build:iwg20m-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: iwg20m
+ dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
+ release: bookworm
+
+build:hihope-rzg2m-bookworm:
+ extends:
+ - .build_base
+ variables:
+ target: hihope-rzg2m
+ dtb: r8a774a1-hihope-rzg2m-ex.dtb
+ release: bookworm
+
+build:qemu-amd64-secure-boot-bookworm:
+ extends:
+ - .build_base
+ variables:
+ base_yaml: "kas-cip.yml:kas/board/${target}.yml"
+ release: bookworm
+ target: qemu-amd64
+ extension: ebg-secure-boot-snakeoil
+ use_rt: disable
+ wic_targz: disable
+ deploy: disable
diff --git a/Kconfig b/Kconfig
index 7d72094..9cfd3b9 100644
--- a/Kconfig
+++ b/Kconfig
@@ -132,6 +132,10 @@ config DEBIAN_BULLSEYE
bool "bullseye (11)"
depends on !ARCH_RISCV64
+config DEBIAN_BOOKWORM
+ bool "bookworm (12)"
+ depends on !ARCH_RISCV64
+
config DEBIAN_SID_PORTS
bool "sid (unstable) with unofficial ports"
depends on ARCH_RISCV64
@@ -142,6 +146,7 @@ config KAS_INCLUDE_DEBIAN
string
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
comment "Image features"
diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
new file mode 100644
index 0000000..de2e435
--- /dev/null
+++ b/conf/distro/cip-core-bookworm.conf
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require conf/distro/debian-bookworm.conf
+require cip-core-common.inc
+
+PREFERRED_VERSION_linux-cip ?= "5.10.%"
+PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
diff --git a/kas/opt/bookworm.yml b/kas/opt/bookworm.yml
new file mode 100644
index 0000000..8b4431b
--- /dev/null
+++ b/kas/opt/bookworm.yml
@@ -0,0 +1,15 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 12
+
+distro: cip-core-bookworm
diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
index b3fe911..bb1aa1d 100644
--- a/recipes-core/images/efibootguard.inc
+++ b/recipes-core/images/efibootguard.inc
@@ -10,6 +10,10 @@
#
IMAGE_INSTALL:append = " efibootguard"
+IMAGE_PREINSTALL:append:sid = " efibootguard"
+IMAGE_PREINSTALL:append:bookworm = " efibootguard"
+IMAGE_INSTALL:append:bullseye = " efibootguard"
+IMAGE_INSTALL:append:buster = " efibootguard"
WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
WDOG_TIMEOUT ?= "60"
diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index 08867cd..817fce0 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -12,5 +12,9 @@
inherit image_uuid
inherit read-only-rootfs
-IMAGE_INSTALL += " swupdate"
+IMAGE_PREINSTALL:append:sid = " swupdate"
+IMAGE_PREINSTALL:append:bookworm = " swupdate"
+IMAGE_INSTALL:append:bullseye = " swupdate"
+IMAGE_INSTALL:append:buster = " swupdate"
+
IMAGE_INSTALL += " swupdate-handler-roundrobin"
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [cip-dev][isar-cip-core][PATCH v2 2/2] efibootguard: use debian folder from salsa
2023-03-10 18:20 [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Quirin Gylstorff
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm) Quirin Gylstorff
@ 2023-03-10 18:20 ` Quirin Gylstorff
2023-04-13 19:29 ` Jan Kiszka
2023-03-13 9:36 ` [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Jan Kiszka
2 siblings, 1 reply; 6+ messages in thread
From: Quirin Gylstorff @ 2023-03-10 18:20 UTC (permalink / raw)
To: felix.moessbauer, cip-dev, jan.kiszka
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
To avoid package name conflicts between cip-core and Debian upstream
use the debian folder from upstream to build efibootguard.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
...guard_0.13.bb => efibootguard_0.13+cip.bb} | 31 +++++++++-------
...l-Make-compatible-with-debian-buster.patch | 36 +++++++++++++++++++
...rol-remove-native-from-python3-shtab.patch | 26 ++++++++++++++
recipes-bsp/efibootguard/files/debian/compat | 1 -
.../efibootguard/files/debian/control.tmpl | 20 -----------
.../debian/efibootguard-dev.install.tmpl | 2 --
.../files/debian/efibootguard.install | 5 ---
recipes-bsp/efibootguard/files/debian/rules | 15 --------
...01-add-machine-type-name-for-riscv64.patch | 0
recipes-core/images/efibootguard.inc | 5 ---
recipes-core/images/swupdate.inc | 6 ++--
recipes-core/swupdate/swupdate.inc | 2 +-
12 files changed, 84 insertions(+), 65 deletions(-)
rename recipes-bsp/efibootguard/{efibootguard_0.13.bb => efibootguard_0.13+cip.bb} (53%)
create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
delete mode 100644 recipes-bsp/efibootguard/files/debian/compat
delete mode 100644 recipes-bsp/efibootguard/files/debian/control.tmpl
delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard.install
delete mode 100755 recipes-bsp/efibootguard/files/debian/rules
rename recipes-bsp/efibootguard/files/{ => src-patches}/0001-add-machine-type-name-for-riscv64.patch (100%)
diff --git a/recipes-bsp/efibootguard/efibootguard_0.13.bb b/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
similarity index 53%
rename from recipes-bsp/efibootguard/efibootguard_0.13.bb
rename to recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
index dd76198..368cc1d 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.13.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
@@ -16,25 +16,30 @@ LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
MAINTAINER = "Jan Kiszka <jan.kiszka@siemens.com>"
+
SRC_URI = " \
- https://github.com/siemens/efibootguard/archive/refs/tags/v${PV}.tar.gz;downloadfilename=efitbootguard-v${PV}.tar.gz \
- file://debian \
+ https://github.com/siemens/efibootguard/archive/refs/tags/v0.13.tar.gz;downloadfilename=efibootguard_0.13.orig.tar.gz;unpack=0;name=tarball \
+ git://salsa.debian.org/debian/efibootguard.git;protocol=https;branch=master;name=debian \
+ file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
+ file://debian-patches/0002-d-control-remove-native-from-python3-shtab.patch \
"
-SRC_URI[sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
+SRC_URI[tarball.sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
+SRCREV_debian = "78a14cbde6ac1d2132a61bddbea7cf39b661d82a"
+
# add riscv64 support
-SRC_URI += "file://0001-add-machine-type-name-for-riscv64.patch"
+SRC_URI += "file://src-patches"
+
CHANGELOG_V = "${PV}+cip"
-PROVIDES = "${PN}"
-PROVIDES += "${PN}-dev"
+PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
-DEPENDS = "python3-shtab"
-BUILD_DEB_DEPENDS = "debhelper,autoconf-archive,check,gnu-efi,libpci-dev,pkg-config,python3-shtab,zlib1g-dev"
-BUILD_DEB_DEPENDS:append:amd64 = ",libc6-dev-i386"
-BUILD_DEB_DEPENDS:append:i386 = ",libc6-dev-i386"
+S = "${WORKDIR}/git"
+
+PATCHTOOL = "git"
inherit dpkg
+DEPENDS = "python3-shtab"
# needed for buster, bullseye could use compat >= 13
python() {
arch = d.getVar('DISTRO_ARCH')
@@ -43,10 +48,10 @@ python() {
d.setVar('DEB_HOST_MULTIARCH', proc.read())
}
-TEMPLATE_FILES = "debian/control.tmpl debian/efibootguard-dev.install.tmpl"
-TEMPLATE_VARS += "DESCRIPTION_DEV BUILD_DEB_DEPENDS DEB_HOST_MULTIARCH"
+CHANGELOG_V = "<orig-version>+isar"
do_prepare_build() {
- cp -R ${WORKDIR}/debian ${S}
deb_add_changelog
+ cd ${S}/debian
+ quilt import ${WORKDIR}/src-patches/*.patch
}
diff --git a/recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch b/recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
new file mode 100644
index 0000000..844eae4
--- /dev/null
+++ b/recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
@@ -0,0 +1,36 @@
+From 299b2fecb4be67b3b669762a88cb3376a9fd5628 Mon Sep 17 00:00:00 2001
+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+Date: Tue, 14 Feb 2023 10:30:34 +0100
+Subject: [PATCH 1/2] d/control: Make compatible with debian buster
+
+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+---
+ debian/compat | 1 +
+ debian/control | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 debian/compat
+
+diff --git a/debian/compat b/debian/compat
+new file mode 100644
+index 0000000..9a03714
+--- /dev/null
++++ b/debian/compat
+@@ -0,0 +1 @@
++10
+\ No newline at end of file
+diff --git a/debian/control b/debian/control
+index fa7867c..8b92019 100644
+--- a/debian/control
++++ b/debian/control
+@@ -2,7 +2,7 @@ Source: efibootguard
+ Section: admin
+ Priority: optional
+ Maintainer: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+-Build-Depends: debhelper-compat (= 13),
++Build-Depends: debhelper,
+ autoconf-archive,
+ check,
+ gnu-efi,
+--
+2.39.1
+
diff --git a/recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch b/recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
new file mode 100644
index 0000000..1c6cdc1
--- /dev/null
+++ b/recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
@@ -0,0 +1,26 @@
+From bc54a466bd48b78a9761a38a7f3b3cf67b19469d Mon Sep 17 00:00:00 2001
+From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+Date: Wed, 15 Feb 2023 10:47:38 +0100
+Subject: [PATCH 2/2] d/control: remove :native from python3-shtab
+
+Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
+---
+ debian/control | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/control b/debian/control
+index 8b92019..53e2b66 100644
+--- a/debian/control
++++ b/debian/control
+@@ -9,7 +9,7 @@ Build-Depends: debhelper,
+ help2man,
+ libpci-dev,
+ pkg-config,
+- python3-shtab:native,
++ python3-shtab,
+ zlib1g-dev
+ Standards-Version: 4.6.1
+ Homepage: https://github.com/siemens/efibootguard
+--
+2.39.1
+
diff --git a/recipes-bsp/efibootguard/files/debian/compat b/recipes-bsp/efibootguard/files/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/recipes-bsp/efibootguard/files/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/recipes-bsp/efibootguard/files/debian/control.tmpl b/recipes-bsp/efibootguard/files/debian/control.tmpl
deleted file mode 100644
index 626d43f..0000000
--- a/recipes-bsp/efibootguard/files/debian/control.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: ${PN}
-Section: base
-Priority: optional
-Standards-Version: 3.9.6
-Build-Depends: ${BUILD_DEB_DEPENDS}
-Homepage: ${HOMEPAGE}
-Maintainer: ${MAINTAINER}
-
-Package: ${PN}
-Depends: ${shlibs:Depends}, python3:any
-Section: base
-Architecture: ${DISTRO_ARCH}
-Priority: required
-Description: ${DESCRIPTION}
-
-Package: ${PN}-dev
-Section: base
-Architecture: ${DISTRO_ARCH}
-Priority: optional
-Description: ${DESCRIPTION_DEV}
diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl b/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
deleted file mode 100644
index 948019a..0000000
--- a/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-include/ebgenv.h usr/include/efibootguard
-libebgenv.a usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard.install b/recipes-bsp/efibootguard/files/debian/efibootguard.install
deleted file mode 100644
index 01cf974..0000000
--- a/recipes-bsp/efibootguard/files/debian/efibootguard.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/*/efibootguard/kernel-stub*.efi
-usr/lib/*/efibootguard/efibootguard*.efi
-usr/lib/*/libebgenv.so.0*
-usr/share/efibootguard/completion
diff --git a/recipes-bsp/efibootguard/files/debian/rules b/recipes-bsp/efibootguard/files/debian/rules
deleted file mode 100755
index 9c3b916..0000000
--- a/recipes-bsp/efibootguard/files/debian/rules
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-export DH_VERBOSE=1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-stackprotector
-include /usr/share/dpkg/pkg-info.mk
-
-override_dh_auto_test:
- # we do not run the tests; that avoids having to pull the fff submodule
-
-override_dh_installchangelogs:
- # we're not interested in changelogs
-
-override_dh_installdocs:
- # we're not interested in docs
-%:
- dh $@ --with autoreconf
diff --git a/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch b/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
similarity index 100%
rename from recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch
rename to recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
index bb1aa1d..cdf5558 100644
--- a/recipes-core/images/efibootguard.inc
+++ b/recipes-core/images/efibootguard.inc
@@ -10,11 +10,6 @@
#
IMAGE_INSTALL:append = " efibootguard"
-IMAGE_PREINSTALL:append:sid = " efibootguard"
-IMAGE_PREINSTALL:append:bookworm = " efibootguard"
-IMAGE_INSTALL:append:bullseye = " efibootguard"
-IMAGE_INSTALL:append:buster = " efibootguard"
-
WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
WDOG_TIMEOUT ?= "60"
WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
index 817fce0..ebc844a 100644
--- a/recipes-core/images/swupdate.inc
+++ b/recipes-core/images/swupdate.inc
@@ -12,9 +12,9 @@
inherit image_uuid
inherit read-only-rootfs
-IMAGE_PREINSTALL:append:sid = " swupdate"
-IMAGE_PREINSTALL:append:bookworm = " swupdate"
-IMAGE_INSTALL:append:bullseye = " swupdate"
IMAGE_INSTALL:append:buster = " swupdate"
+IMAGE_INSTALL:append:bullseye = " swupdate"
+IMAGE_PREINSTALL:append:bookworm = " swupdate"
+IMAGE_PREINSTALL:append:sid = " swupdate"
IMAGE_INSTALL += " swupdate-handler-roundrobin"
diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
index 53b8133..e5e7282 100644
--- a/recipes-core/swupdate/swupdate.inc
+++ b/recipes-core/swupdate/swupdate.inc
@@ -26,7 +26,7 @@ DEB_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
def get_bootloader_dependencies(d):
bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
if bootloader == "efibootguard":
- return "efibootguard-dev"
+ return "libebgenv-dev"
if bootloader == "u-boot":
if d.getVar("U_BOOT_CONFIG_PACKAGE") == "1":
return "libubootenv u-boot-{}-config".format(d.getVar("MACHINE"))
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12
2023-03-10 18:20 [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Quirin Gylstorff
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm) Quirin Gylstorff
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 2/2] efibootguard: use debian folder from salsa Quirin Gylstorff
@ 2023-03-13 9:36 ` Jan Kiszka
2 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2023-03-13 9:36 UTC (permalink / raw)
To: Quirin Gylstorff, felix.moessbauer, cip-dev
On 10.03.23 19:20, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> Add ci builds for bookworm
> Change efibootguard build to use debian folder from salsa
>
> Changes v2:
> - rebase onto next
> - always build efibootguard
>
>
> Quirin Gylstorff (2):
> Enable Images based on Debian 12 (bookworm)
> efibootguard: use debian folder from salsa
>
> .gitlab-ci.yml | 45 +++++++++++++++++++
> Kconfig | 5 +++
> conf/distro/cip-core-bookworm.conf | 16 +++++++
> kas/opt/bookworm.yml | 15 +++++++
> ...guard_0.13.bb => efibootguard_0.13+cip.bb} | 31 +++++++------
> ...l-Make-compatible-with-debian-buster.patch | 36 +++++++++++++++
> ...rol-remove-native-from-python3-shtab.patch | 26 +++++++++++
> recipes-bsp/efibootguard/files/debian/compat | 1 -
> .../efibootguard/files/debian/control.tmpl | 20 ---------
> .../debian/efibootguard-dev.install.tmpl | 2 -
> .../files/debian/efibootguard.install | 5 ---
> recipes-bsp/efibootguard/files/debian/rules | 15 -------
> ...01-add-machine-type-name-for-riscv64.patch | 0
> recipes-core/images/efibootguard.inc | 1 -
> recipes-core/images/swupdate.inc | 6 ++-
> recipes-core/swupdate/swupdate.inc | 2 +-
> 16 files changed, 167 insertions(+), 59 deletions(-)
> create mode 100644 conf/distro/cip-core-bookworm.conf
> create mode 100644 kas/opt/bookworm.yml
> rename recipes-bsp/efibootguard/{efibootguard_0.13.bb => efibootguard_0.13+cip.bb} (53%)
> create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
> create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
> delete mode 100644 recipes-bsp/efibootguard/files/debian/compat
> delete mode 100644 recipes-bsp/efibootguard/files/debian/control.tmpl
> delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
> delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard.install
> delete mode 100755 recipes-bsp/efibootguard/files/debian/rules
> rename recipes-bsp/efibootguard/files/{ => src-patches}/0001-add-machine-type-name-for-riscv64.patch (100%)
>
As I postponed freezing already longer than planned and patch 2 has
quite some impact on ebg builds, I would push this post-release (should
then be in with the summer release). Any concerns?
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [cip-dev][isar-cip-core][PATCH v2 2/2] efibootguard: use debian folder from salsa
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 2/2] efibootguard: use debian folder from salsa Quirin Gylstorff
@ 2023-04-13 19:29 ` Jan Kiszka
0 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2023-04-13 19:29 UTC (permalink / raw)
To: Quirin Gylstorff, felix.moessbauer, cip-dev
On 10.03.23 19:20, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> To avoid package name conflicts between cip-core and Debian upstream
> use the debian folder from upstream to build efibootguard.
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> ...guard_0.13.bb => efibootguard_0.13+cip.bb} | 31 +++++++++-------
> ...l-Make-compatible-with-debian-buster.patch | 36 +++++++++++++++++++
> ...rol-remove-native-from-python3-shtab.patch | 26 ++++++++++++++
> recipes-bsp/efibootguard/files/debian/compat | 1 -
> .../efibootguard/files/debian/control.tmpl | 20 -----------
> .../debian/efibootguard-dev.install.tmpl | 2 --
> .../files/debian/efibootguard.install | 5 ---
> recipes-bsp/efibootguard/files/debian/rules | 15 --------
> ...01-add-machine-type-name-for-riscv64.patch | 0
> recipes-core/images/efibootguard.inc | 5 ---
> recipes-core/images/swupdate.inc | 6 ++--
> recipes-core/swupdate/swupdate.inc | 2 +-
> 12 files changed, 84 insertions(+), 65 deletions(-)
> rename recipes-bsp/efibootguard/{efibootguard_0.13.bb => efibootguard_0.13+cip.bb} (53%)
> create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
> create mode 100644 recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
> delete mode 100644 recipes-bsp/efibootguard/files/debian/compat
> delete mode 100644 recipes-bsp/efibootguard/files/debian/control.tmpl
> delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
> delete mode 100644 recipes-bsp/efibootguard/files/debian/efibootguard.install
> delete mode 100755 recipes-bsp/efibootguard/files/debian/rules
> rename recipes-bsp/efibootguard/files/{ => src-patches}/0001-add-machine-type-name-for-riscv64.patch (100%)
>
> diff --git a/recipes-bsp/efibootguard/efibootguard_0.13.bb b/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
> similarity index 53%
> rename from recipes-bsp/efibootguard/efibootguard_0.13.bb
> rename to recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
> index dd76198..368cc1d 100644
> --- a/recipes-bsp/efibootguard/efibootguard_0.13.bb
> +++ b/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
> @@ -16,25 +16,30 @@ LICENSE = "GPL-2.0"
> LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
> MAINTAINER = "Jan Kiszka <jan.kiszka@siemens.com>"
>
> +
> SRC_URI = " \
> - https://github.com/siemens/efibootguard/archive/refs/tags/v${PV}.tar.gz;downloadfilename=efitbootguard-v${PV}.tar.gz \
> - file://debian \
> + https://github.com/siemens/efibootguard/archive/refs/tags/v0.13.tar.gz;downloadfilename=efibootguard_0.13.orig.tar.gz;unpack=0;name=tarball \
> + git://salsa.debian.org/debian/efibootguard.git;protocol=https;branch=master;name=debian \
> + file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
> + file://debian-patches/0002-d-control-remove-native-from-python3-shtab.patch \
> "
> -SRC_URI[sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
> +SRC_URI[tarball.sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
> +SRCREV_debian = "78a14cbde6ac1d2132a61bddbea7cf39b661d82a"
> +
> # add riscv64 support
> -SRC_URI += "file://0001-add-machine-type-name-for-riscv64.patch"
> +SRC_URI += "file://src-patches"
> +
> CHANGELOG_V = "${PV}+cip"
>
> -PROVIDES = "${PN}"
> -PROVIDES += "${PN}-dev"
> +PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
>
> -DEPENDS = "python3-shtab"
> -BUILD_DEB_DEPENDS = "debhelper,autoconf-archive,check,gnu-efi,libpci-dev,pkg-config,python3-shtab,zlib1g-dev"
> -BUILD_DEB_DEPENDS:append:amd64 = ",libc6-dev-i386"
> -BUILD_DEB_DEPENDS:append:i386 = ",libc6-dev-i386"
> +S = "${WORKDIR}/git"
> +
> +PATCHTOOL = "git"
>
> inherit dpkg
>
> +DEPENDS = "python3-shtab"
> # needed for buster, bullseye could use compat >= 13
> python() {
> arch = d.getVar('DISTRO_ARCH')
> @@ -43,10 +48,10 @@ python() {
> d.setVar('DEB_HOST_MULTIARCH', proc.read())
> }
>
> -TEMPLATE_FILES = "debian/control.tmpl debian/efibootguard-dev.install.tmpl"
> -TEMPLATE_VARS += "DESCRIPTION_DEV BUILD_DEB_DEPENDS DEB_HOST_MULTIARCH"
> +CHANGELOG_V = "<orig-version>+isar"
>
> do_prepare_build() {
> - cp -R ${WORKDIR}/debian ${S}
> deb_add_changelog
> + cd ${S}/debian
> + quilt import ${WORKDIR}/src-patches/*.patch
> }
> diff --git a/recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch b/recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
> new file mode 100644
> index 0000000..844eae4
> --- /dev/null
> +++ b/recipes-bsp/efibootguard/files/debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
> @@ -0,0 +1,36 @@
> +From 299b2fecb4be67b3b669762a88cb3376a9fd5628 Mon Sep 17 00:00:00 2001
> +From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +Date: Tue, 14 Feb 2023 10:30:34 +0100
> +Subject: [PATCH 1/2] d/control: Make compatible with debian buster
> +
> +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +---
> + debian/compat | 1 +
> + debian/control | 2 +-
> + 2 files changed, 2 insertions(+), 1 deletion(-)
> + create mode 100644 debian/compat
> +
> +diff --git a/debian/compat b/debian/compat
> +new file mode 100644
> +index 0000000..9a03714
> +--- /dev/null
> ++++ b/debian/compat
> +@@ -0,0 +1 @@
> ++10
> +\ No newline at end of file
> +diff --git a/debian/control b/debian/control
> +index fa7867c..8b92019 100644
> +--- a/debian/control
> ++++ b/debian/control
> +@@ -2,7 +2,7 @@ Source: efibootguard
> + Section: admin
> + Priority: optional
> + Maintainer: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +-Build-Depends: debhelper-compat (= 13),
> ++Build-Depends: debhelper,
> + autoconf-archive,
> + check,
> + gnu-efi,
> +--
> +2.39.1
> +
> diff --git a/recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch b/recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
> new file mode 100644
> index 0000000..1c6cdc1
> --- /dev/null
> +++ b/recipes-bsp/efibootguard/files/debian-patches/0002-d-control-remove-native-from-python3-shtab.patch
> @@ -0,0 +1,26 @@
> +From bc54a466bd48b78a9761a38a7f3b3cf67b19469d Mon Sep 17 00:00:00 2001
> +From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +Date: Wed, 15 Feb 2023 10:47:38 +0100
> +Subject: [PATCH 2/2] d/control: remove :native from python3-shtab
> +
Why do we need this deviation?
> +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +---
> + debian/control | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/debian/control b/debian/control
> +index 8b92019..53e2b66 100644
> +--- a/debian/control
> ++++ b/debian/control
> +@@ -9,7 +9,7 @@ Build-Depends: debhelper,
> + help2man,
> + libpci-dev,
> + pkg-config,
> +- python3-shtab:native,
> ++ python3-shtab,
> + zlib1g-dev
> + Standards-Version: 4.6.1
> + Homepage: https://github.com/siemens/efibootguard
> +--
> +2.39.1
> +
> diff --git a/recipes-bsp/efibootguard/files/debian/compat b/recipes-bsp/efibootguard/files/debian/compat
> deleted file mode 100644
> index ec63514..0000000
> --- a/recipes-bsp/efibootguard/files/debian/compat
> +++ /dev/null
> @@ -1 +0,0 @@
> -9
> diff --git a/recipes-bsp/efibootguard/files/debian/control.tmpl b/recipes-bsp/efibootguard/files/debian/control.tmpl
> deleted file mode 100644
> index 626d43f..0000000
> --- a/recipes-bsp/efibootguard/files/debian/control.tmpl
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -Source: ${PN}
> -Section: base
> -Priority: optional
> -Standards-Version: 3.9.6
> -Build-Depends: ${BUILD_DEB_DEPENDS}
> -Homepage: ${HOMEPAGE}
> -Maintainer: ${MAINTAINER}
> -
> -Package: ${PN}
> -Depends: ${shlibs:Depends}, python3:any
> -Section: base
> -Architecture: ${DISTRO_ARCH}
> -Priority: required
> -Description: ${DESCRIPTION}
> -
> -Package: ${PN}-dev
> -Section: base
> -Architecture: ${DISTRO_ARCH}
> -Priority: optional
> -Description: ${DESCRIPTION_DEV}
> diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl b/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
> deleted file mode 100644
> index 948019a..0000000
> --- a/recipes-bsp/efibootguard/files/debian/efibootguard-dev.install.tmpl
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -include/ebgenv.h usr/include/efibootguard
> -libebgenv.a usr/lib/${DEB_HOST_MULTIARCH}
> diff --git a/recipes-bsp/efibootguard/files/debian/efibootguard.install b/recipes-bsp/efibootguard/files/debian/efibootguard.install
> deleted file mode 100644
> index 01cf974..0000000
> --- a/recipes-bsp/efibootguard/files/debian/efibootguard.install
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -usr/bin
> -usr/lib/*/efibootguard/kernel-stub*.efi
> -usr/lib/*/efibootguard/efibootguard*.efi
> -usr/lib/*/libebgenv.so.0*
> -usr/share/efibootguard/completion
> diff --git a/recipes-bsp/efibootguard/files/debian/rules b/recipes-bsp/efibootguard/files/debian/rules
> deleted file mode 100755
> index 9c3b916..0000000
> --- a/recipes-bsp/efibootguard/files/debian/rules
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -#!/usr/bin/make -f
> -export DH_VERBOSE=1
> -export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-stackprotector
> -include /usr/share/dpkg/pkg-info.mk
> -
> -override_dh_auto_test:
> - # we do not run the tests; that avoids having to pull the fff submodule
> -
> -override_dh_installchangelogs:
> - # we're not interested in changelogs
> -
> -override_dh_installdocs:
> - # we're not interested in docs
> -%:
> - dh $@ --with autoreconf
> diff --git a/recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch b/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
> similarity index 100%
> rename from recipes-bsp/efibootguard/files/0001-add-machine-type-name-for-riscv64.patch
> rename to recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
> diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
> index bb1aa1d..cdf5558 100644
> --- a/recipes-core/images/efibootguard.inc
> +++ b/recipes-core/images/efibootguard.inc
> @@ -10,11 +10,6 @@
> #
>
> IMAGE_INSTALL:append = " efibootguard"
> -IMAGE_PREINSTALL:append:sid = " efibootguard"
> -IMAGE_PREINSTALL:append:bookworm = " efibootguard"
> -IMAGE_INSTALL:append:bullseye = " efibootguard"
> -IMAGE_INSTALL:append:buster = " efibootguard"
> -
> WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
> WDOG_TIMEOUT ?= "60"
> WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
> diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
> index 817fce0..ebc844a 100644
> --- a/recipes-core/images/swupdate.inc
> +++ b/recipes-core/images/swupdate.inc
> @@ -12,9 +12,9 @@
> inherit image_uuid
> inherit read-only-rootfs
>
> -IMAGE_PREINSTALL:append:sid = " swupdate"
> -IMAGE_PREINSTALL:append:bookworm = " swupdate"
> -IMAGE_INSTALL:append:bullseye = " swupdate"
> IMAGE_INSTALL:append:buster = " swupdate"
> +IMAGE_INSTALL:append:bullseye = " swupdate"
> +IMAGE_PREINSTALL:append:bookworm = " swupdate"
> +IMAGE_PREINSTALL:append:sid = " swupdate"
>
> IMAGE_INSTALL += " swupdate-handler-roundrobin"
> diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc
> index 53b8133..e5e7282 100644
> --- a/recipes-core/swupdate/swupdate.inc
> +++ b/recipes-core/swupdate/swupdate.inc
> @@ -26,7 +26,7 @@ DEB_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
> def get_bootloader_dependencies(d):
> bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
> if bootloader == "efibootguard":
> - return "efibootguard-dev"
> + return "libebgenv-dev"
> if bootloader == "u-boot":
> if d.getVar("U_BOOT_CONFIG_PACKAGE") == "1":
> return "libubootenv u-boot-{}-config".format(d.getVar("MACHINE"))
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm)
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm) Quirin Gylstorff
@ 2023-04-13 20:43 ` Jan Kiszka
0 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2023-04-13 20:43 UTC (permalink / raw)
To: Quirin Gylstorff, felix.moessbauer, cip-dev
On 10.03.23 19:20, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> This will add prelimitary support for the debian 12 aka bookworm.
>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> .gitlab-ci.yml | 45 ++++++++++++++++++++++++++++
> Kconfig | 5 ++++
> conf/distro/cip-core-bookworm.conf | 16 ++++++++++
> kas/opt/bookworm.yml | 15 ++++++++++
> recipes-core/images/efibootguard.inc | 4 +++
> recipes-core/images/swupdate.inc | 6 +++-
> 6 files changed, 90 insertions(+), 1 deletion(-)
> create mode 100644 conf/distro/cip-core-bookworm.conf
> create mode 100644 kas/opt/bookworm.yml
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index f51b64b..be1d8d9 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -55,6 +55,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}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi
> + - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi
> - echo "Building ${base_yaml}"
> - kas build ${base_yaml}
> - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
> @@ -312,3 +313,47 @@ build:qemu-riscv64:
> deploy: disable
>
> include: '.reproducible-check-ci.yml'
> +
> +# bookworm images
> +build:simatic-ipc227e-bookworm:
> + extends:
> + - .build_base
> + variables:
> + target: simatic-ipc227e
> + release: bookworm
> +
> +build:bbb-bookworm:
> + extends:
> + - .build_base
> + variables:
> + target: bbb
> + dtb: am335x-boneblack.dtb
> + release: bookworm
> +
> +build:iwg20m-bookworm:
> + extends:
> + - .build_base
> + variables:
> + target: iwg20m
> + dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb
> + release: bookworm
> +
> +build:hihope-rzg2m-bookworm:
> + extends:
> + - .build_base
> + variables:
> + target: hihope-rzg2m
> + dtb: r8a774a1-hihope-rzg2m-ex.dtb
> + release: bookworm
> +
> +build:qemu-amd64-secure-boot-bookworm:
> + extends:
> + - .build_base
> + variables:
> + base_yaml: "kas-cip.yml:kas/board/${target}.yml"
> + release: bookworm
> + target: qemu-amd64
> + extension: ebg-secure-boot-snakeoil
> + use_rt: disable
> + wic_targz: disable
> + deploy: disable
> diff --git a/Kconfig b/Kconfig
> index 7d72094..9cfd3b9 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -132,6 +132,10 @@ config DEBIAN_BULLSEYE
> bool "bullseye (11)"
> depends on !ARCH_RISCV64
>
> +config DEBIAN_BOOKWORM
> + bool "bookworm (12)"
> + depends on !ARCH_RISCV64
> +
> config DEBIAN_SID_PORTS
> bool "sid (unstable) with unofficial ports"
> depends on ARCH_RISCV64
> @@ -142,6 +146,7 @@ config KAS_INCLUDE_DEBIAN
> string
> 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
>
> comment "Image features"
> diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
> new file mode 100644
> index 0000000..de2e435
> --- /dev/null
> +++ b/conf/distro/cip-core-bookworm.conf
> @@ -0,0 +1,16 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require conf/distro/debian-bookworm.conf
> +require cip-core-common.inc
> +
> +PREFERRED_VERSION_linux-cip ?= "5.10.%"
> +PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
> diff --git a/kas/opt/bookworm.yml b/kas/opt/bookworm.yml
> new file mode 100644
> index 0000000..8b4431b
> --- /dev/null
> +++ b/kas/opt/bookworm.yml
> @@ -0,0 +1,15 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 12
> +
> +distro: cip-core-bookworm
> diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
> index b3fe911..bb1aa1d 100644
> --- a/recipes-core/images/efibootguard.inc
> +++ b/recipes-core/images/efibootguard.inc
> @@ -10,6 +10,10 @@
> #
>
> IMAGE_INSTALL:append = " efibootguard"
> +IMAGE_PREINSTALL:append:sid = " efibootguard"
> +IMAGE_PREINSTALL:append:bookworm = " efibootguard"
> +IMAGE_INSTALL:append:bullseye = " efibootguard"
> +IMAGE_INSTALL:append:buster = " efibootguard"
>
> WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
> WDOG_TIMEOUT ?= "60"
> diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc
> index 08867cd..817fce0 100644
> --- a/recipes-core/images/swupdate.inc
> +++ b/recipes-core/images/swupdate.inc
> @@ -12,5 +12,9 @@
> inherit image_uuid
> inherit read-only-rootfs
>
> -IMAGE_INSTALL += " swupdate"
> +IMAGE_PREINSTALL:append:sid = " swupdate"
> +IMAGE_PREINSTALL:append:bookworm = " swupdate"
> +IMAGE_INSTALL:append:bullseye = " swupdate"
> +IMAGE_INSTALL:append:buster = " swupdate"
> +
> IMAGE_INSTALL += " swupdate-handler-roundrobin"
Thanks, merged this one already.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-13 20:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-10 18:20 [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Quirin Gylstorff
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 1/2] Enable Images based on Debian 12 (bookworm) Quirin Gylstorff
2023-04-13 20:43 ` Jan Kiszka
2023-03-10 18:20 ` [cip-dev][isar-cip-core][PATCH v2 2/2] efibootguard: use debian folder from salsa Quirin Gylstorff
2023-04-13 19:29 ` Jan Kiszka
2023-03-13 9:36 ` [cip-dev][isar-cip-core][PATCH v2 0/2] Enable Images based on Debian 12 Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).