* [PATCH xenomai-images v2 1/4] ci: Update kas to 3.2.3
2023-05-04 7:58 [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Florian Bezdeka
@ 2023-05-04 7:58 ` Florian Bezdeka
2023-05-04 7:58 ` [PATCH xenomai-images v2 2/4] customizations: Mask systemd-network-generator service Florian Bezdeka
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Florian Bezdeka @ 2023-05-04 7:58 UTC (permalink / raw)
To: jan.kiszka, xenomai; +Cc: Florian Bezdeka
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
README.md | 2 +-
ci/gitlab-ci-base.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 392865a..638768b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ from scratch.
Install `kas-container` from the [kas project](https://github.com/siemens/kas):
- wget https://raw.githubusercontent.com/siemens/kas/3.1/kas-container -P ~/bin/
+ wget https://raw.githubusercontent.com/siemens/kas/3.2.3/kas-container -P ~/bin/
chmod a+x ~/bin/kas-container
Furthermore, install docker and make sure you have required permissions to
diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
index b7dd4dc..2dbb82d 100644
--- a/ci/gitlab-ci-base.yml
+++ b/ci/gitlab-ci-base.yml
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2019 - 2022
+# Copyright (c) Siemens AG, 2019 - 2023
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -23,7 +23,7 @@ variables:
BUILD_IDENTIFIER: "xenomai-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}"
default:
- image: ghcr.io/siemens/kas/kas-isar:3.1
+ image: ghcr.io/siemens/kas/kas-isar:3.2.3
.common-config:
before_script:
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH xenomai-images v2 2/4] customizations: Mask systemd-network-generator service
2023-05-04 7:58 [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Florian Bezdeka
2023-05-04 7:58 ` [PATCH xenomai-images v2 1/4] ci: Update kas to 3.2.3 Florian Bezdeka
@ 2023-05-04 7:58 ` Florian Bezdeka
2023-05-04 7:58 ` [PATCH xenomai-images v2 3/4] xenomai-demo: Switch base distribution to Debian bookworm Florian Bezdeka
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Florian Bezdeka @ 2023-05-04 7:58 UTC (permalink / raw)
To: jan.kiszka, xenomai; +Cc: Florian Bezdeka
We use ip=dhcp as kernel cmdline option for most of our CI targets.
This cmdline option is now taken into account by newer systemd versions
and a network configuration generation in userspace is triggered.
WLAN interfaces are part of the generated network configuration and
might trigger a complete system hang. Especially the HiKey board in
combination with 4.19 (ipipe) is affected.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
recipes-core/customizations/files/postinst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipes-core/customizations/files/postinst b/recipes-core/customizations/files/postinst
index 691988f..d8d141c 100644
--- a/recipes-core/customizations/files/postinst
+++ b/recipes-core/customizations/files/postinst
@@ -15,3 +15,5 @@ echo "Xenomai Demo Image (login: root/root)" > /etc/issue
echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
echo "demo" > /etc/hostname
+
+/usr/bin/systemctl mask systemd-network-generator
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH xenomai-images v2 3/4] xenomai-demo: Switch base distribution to Debian bookworm
2023-05-04 7:58 [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Florian Bezdeka
2023-05-04 7:58 ` [PATCH xenomai-images v2 1/4] ci: Update kas to 3.2.3 Florian Bezdeka
2023-05-04 7:58 ` [PATCH xenomai-images v2 2/4] customizations: Mask systemd-network-generator service Florian Bezdeka
@ 2023-05-04 7:58 ` Florian Bezdeka
2023-05-04 7:58 ` [PATCH xenomai-images v2 4/4] customizations: Migrate from ifup to systemd-networkd Florian Bezdeka
2023-05-04 8:19 ` [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Jan Kiszka
4 siblings, 0 replies; 6+ messages in thread
From: Florian Bezdeka @ 2023-05-04 7:58 UTC (permalink / raw)
To: jan.kiszka, xenomai; +Cc: Florian Bezdeka
Bookworm ships a glibc version (>= 2.34) that allows us to enable y2038
support within xenomai and the testsuite.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
conf/distro/xenomai-demo.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
index 10c37e1..c99669d 100644
--- a/conf/distro/xenomai-demo.conf
+++ b/conf/distro/xenomai-demo.conf
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2018-2021
+# Copyright (c) Siemens AG, 2018-2023
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -9,12 +9,12 @@
# SPDX-License-Identifier: MIT
#
-require conf/distro/debian-bullseye.conf
+require conf/distro/debian-bookworm.conf
PREFERRED_VERSION_xenomai ?= "3.2%"
include conf/distro/include/xenomai-version.inc
-HOST_DISTRO ?= "debian-bullseye"
+HOST_DISTRO ?= "debian-bookworm"
KERNEL_NAME = "xenomai"
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH xenomai-images v2 4/4] customizations: Migrate from ifup to systemd-networkd
2023-05-04 7:58 [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Florian Bezdeka
` (2 preceding siblings ...)
2023-05-04 7:58 ` [PATCH xenomai-images v2 3/4] xenomai-demo: Switch base distribution to Debian bookworm Florian Bezdeka
@ 2023-05-04 7:58 ` Florian Bezdeka
2023-05-04 8:19 ` [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Jan Kiszka
4 siblings, 0 replies; 6+ messages in thread
From: Florian Bezdeka @ 2023-05-04 7:58 UTC (permalink / raw)
To: jan.kiszka, xenomai; +Cc: Florian Bezdeka
This is a boot-time optimization for some boards. As we are using
ip=dhcp for most CI targets the kernel already pre-configures one
network device using DHCP.
When using the traditional interface configuration in
/etc/network/interfaces.d the following warning - and a boot hang for
up to 90 sec - could be observed:
[ TIME ] Timed out waiting for device s/subsystem/net/devices/eth0.
[DEPEND] Dependency failed for ifup for eth0.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
recipes-core/customizations/customizations.bb | 8 ++++----
recipes-core/customizations/files/ethernet | 19 -------------------
recipes-core/customizations/files/primary.network | 5 +++++
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb
index 0faaff8..f86bf68 100644
--- a/recipes-core/customizations/customizations.bb
+++ b/recipes-core/customizations/customizations.bb
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2018-2021
+# Copyright (c) Siemens AG, 2018-2023
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -15,14 +15,14 @@ DESCRIPTION = "demo image customizations"
SRC_URI = " \
file://postinst \
- file://ethernet \
+ file://primary.network \
file://99-silent-printk.conf"
DEBIAN_DEPENDS = "openssh-server"
do_install() {
- install -v -d ${D}/etc/network/interfaces.d
- install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
+ install -d ${D}/etc/systemd/network
+ install -m 640 ${WORKDIR}/*.network ${D}/etc/systemd/network/
install -v -d ${D}/etc/sysctl.d
install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
diff --git a/recipes-core/customizations/files/ethernet b/recipes-core/customizations/files/ethernet
deleted file mode 100644
index d282ce1..0000000
--- a/recipes-core/customizations/files/ethernet
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2018
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-allow-hotplug eth0
-allow-hotplug enp0s2
-
-# used on qemu-arm and qemu-arm64
-iface eth0 inet dhcp
-
-# used on qemu-amd64
-iface enp0s2 inet dhcp
diff --git a/recipes-core/customizations/files/primary.network b/recipes-core/customizations/files/primary.network
new file mode 100644
index 0000000..c517d10
--- /dev/null
+++ b/recipes-core/customizations/files/primary.network
@@ -0,0 +1,5 @@
+[Match]
+Name=eth0 enp2s0 enp3s0
+
+[Network]
+DHCP=yes
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm
2023-05-04 7:58 [PATCH xenomai-images v2 0/4] Lift the base distribution to Debian bookworm Florian Bezdeka
` (3 preceding siblings ...)
2023-05-04 7:58 ` [PATCH xenomai-images v2 4/4] customizations: Migrate from ifup to systemd-networkd Florian Bezdeka
@ 2023-05-04 8:19 ` Jan Kiszka
4 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2023-05-04 8:19 UTC (permalink / raw)
To: Florian Bezdeka, xenomai
On 04.05.23 09:58, Florian Bezdeka wrote:
> Debian 12, code name Bookworm, will be released on June 10th 2023.
> See [1] for the official announcement.
>
> I tested xenomai-images on bookworm for several months now. The main
> reason was a recent glibc in bookworm which allows me to enable y2038
> support in applications. This is a pre-condition for testing and
> enabling y2038 support for Xenomai itself.
>
> The remaining y2038 stuff is currently waiting in [2]. With this series
> applied we have reached another mile stone: Prepare the test environment
> (xenomai-images) for y2038 enablement.
>
> [1] https://lists.debian.org/debian-devel-announce/2023/04/msg00007.html
> [2] https://gitlab.com/Xenomai/xenomai-hacker-space/-/tree/florian/y2038
>
> Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
> ---
> Changes in v2:
> - Flipped order of patches 2 and 3
> - Link to v1: https://lore.kernel.org/r/20230503-flo-debian-bookworm-update-v1-0-6a4aa9e4d95f@siemens.com
>
> ---
> Florian Bezdeka (4):
> ci: Update kas to 3.2.3
> customizations: Mask systemd-network-generator service
> xenomai-demo: Switch base distribution to Debian bookworm
> customizations: Migrate from ifup to systemd-networkd
>
> README.md | 2 +-
> ci/gitlab-ci-base.yml | 4 ++--
> conf/distro/xenomai-demo.conf | 6 +++---
> recipes-core/customizations/customizations.bb | 8 ++++----
> recipes-core/customizations/files/ethernet | 19 -------------------
> recipes-core/customizations/files/postinst | 2 ++
> recipes-core/customizations/files/primary.network | 5 +++++
> 7 files changed, 17 insertions(+), 29 deletions(-)
> ---
> base-commit: f20791525153c50c16b598127e7fc9d577c8e679
> change-id: 20230503-flo-debian-bookworm-update-42686a56ec66
>
> Best regards,
Thanks, applied.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread