Version updates, start-qemu fix
cover Version updates, start-qemu fix
Just housekeeping
Jan
Jan Kiszka (3):
linux-xenomai: Refresh releases and simplify their maintenance
xenomai: Update to latest releases
start-qemu: Start with read-writable rootfs
conf/distro/include/xenomai-version.inc | 8 ++++----
recipes-kernel/linux/linux-xenomai_4.19.bb | 13 ++++++-------
recipes-kernel/linux/linux-xenomai_4.4.bb | 10 +++++-----
recipes-kernel/linux/linux-xenomai_5.10.bb | 7 ++++---
recipes-kernel/linux/linux-xenomai_5.15.bb | 7 ++++---
recipes-kernel/linux/linux-xenomai_5.4.bb | 13 ++++++-------
.../{xenomai_3.0.12.bb => xenomai_3.0.13.bb} | 0
.../xenomai/{xenomai_3.1.2.bb => xenomai_3.1.3.bb} | 0
.../xenomai/{xenomai_3.2.1.bb => xenomai_3.2.2.bb} | 0
start-qemu.sh | 6 +++---
10 files changed, 32 insertions(+), 32 deletions(-)
rename recipes-xenomai/xenomai/{xenomai_3.0.12.bb => xenomai_3.0.13.bb} (100%)
rename recipes-xenomai/xenomai/{xenomai_3.1.2.bb => xenomai_3.1.3.bb} (100%)
rename recipes-xenomai/xenomai/{xenomai_3.2.1.bb => xenomai_3.2.2.bb} (100%)Signature · 1 line
2.35.3
PATCH 1/3 linux-xenomai: Refresh releases and simplify their maintenance
From: Jan Kiszka <[email protected]>
PV can be derived from the release tags, so only the latter need to be updated in the future. But make sure that SRCREV and PV remain overwritable consistently.
--- recipes-kernel/linux/linux-xenomai_4.19.bb | 13 ++++++------- recipes-kernel/linux/linux-xenomai_4.4.bb | 10 +++++----- recipes-kernel/linux/linux-xenomai_5.10.bb | 7 ++++--- recipes-kernel/linux/linux-xenomai_5.15.bb | 7 ++++--- recipes-kernel/linux/linux-xenomai_5.4.bb | 13 ++++++------- 5 files changed, 25 insertions(+), 25 deletions(-)
recipes-kernel/linux/linux-xenomai_4.19.bb +6 -7
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019-2021 +# Copyright (c) Siemens AG, 2019-2023 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -12,15 +12,14 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1" -SRCREV_amd64 ?= "ipipe-core-4.19.207-cip58-x86-20" -PV_amd64 ?= "4.19.207+" +SRCREV_amd64 ?= "ipipe-core-4.19.266-cip86-x86-25" SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1" -SRCREV_arm64 ?= "ipipe-core-4.19.209-cip59-arm64-12" -PV_arm64 ?= "4.19.209+" +SRCREV_arm64 ?= "ipipe-core-4.19.229-cip67-arm64-13" SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1" -SRCREV_armhf ?= "ipipe-core-4.19.207-cip58-arm16" -PV_armhf ?= "4.19.207+" +SRCREV_armhf ?= "ipipe-core-4.19.229-cip67-arm-18" + +PV ?= "${@d.getVar('SRCREV').split('-')[2]}+" S = "${WORKDIR}/git"
recipes-kernel/linux/linux-xenomai_4.4.bb +5 -5
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2018-2021 +# Copyright (c) Siemens AG, 2018-2023 # # Authors: # Jan Kiszka <[email protected]>
@@ -12,12 +12,12 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1" -SRCREV_amd64 ?= "ipipe-core-4.4.285-cip63-x86-30" -PV_amd64 = "4.4.285+" +SRCREV_amd64 ?= "ipipe-core-4.4.302-cip71-x86-35" SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1" SRC_URI_append_armhf = " ${@ 'file://bbb_4.4.cfg' if d.getVar('MACHINE') == 'beagle-bone-black' else '' }" -SRCREV_armhf ?= "ipipe-core-4.4.285-cip63-arm-15" -PV_armhf = "4.4.285+" +SRCREV_armhf ?= "ipipe-core-4.4.302-cip71-arm-20" + +PV ?= "${@d.getVar('SRCREV').split('-')[2]}+" S = "${WORKDIR}/git"
recipes-kernel/linux/linux-xenomai_5.10.bb +4 -3
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2021-2023 # # Authors: # Jan Kiszka <[email protected]>
@@ -12,7 +12,8 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1" -SRCREV = "v5.10.76-dovetail3" -PV = "5.10.76+" +SRCREV ?= "v5.10.161-dovetail1" + +PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+" S = "${WORKDIR}/git"
recipes-kernel/linux/linux-xenomai_5.15.bb +4 -3
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2021-2023 # # Authors: # Jan Kiszka <[email protected]>
@@ -12,7 +12,8 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1" -SRCREV = "v5.15.57-dovetail1" -PV = "5.15.57+" +SRCREV ?= "v5.15.85-dovetail1" + +PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+" S = "${WORKDIR}/git"
recipes-kernel/linux/linux-xenomai_5.4.bb +6 -7
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2021-2023 # # Authors: # Jan Kiszka <[email protected]>
@@ -12,15 +12,14 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1" -SRCREV_amd64 ?= "ipipe-core-5.4.151-x86-7" -PV_amd64 ?= "5.4.151+" +SRCREV_amd64 ?= "ipipe-core-5.4.228-x86-12" SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1" -SRCREV_arm64 ?= "ipipe-core-5.4.152-arm64-3" -PV_arm64 ?= "5.4.152+" +SRCREV_arm64 ?= "ipipe-core-5.4.180-arm64-5" SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1" -SRCREV_armhf ?= "ipipe-core-5.4.151-arm-4" -PV_armhf ?= "5.4.151+" +SRCREV_armhf ?= "ipipe-core-5.4.180-arm-5" + +PV ?= "${@d.getVar('SRCREV').split('-')[2]}+" S = "${WORKDIR}/git"
Signature · 1 line
2.35.3
PATCH 2/3 xenomai: Update to latest releases
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
---
conf/distro/include/xenomai-version.inc | 8 ++++----
.../xenomai/{xenomai_3.0.12.bb => xenomai_3.0.13.bb} | 0
.../xenomai/{xenomai_3.1.2.bb => xenomai_3.1.3.bb} | 0
.../xenomai/{xenomai_3.2.1.bb => xenomai_3.2.2.bb} | 0
4 files changed, 4 insertions(+), 4 deletions(-)
rename recipes-xenomai/xenomai/{xenomai_3.0.12.bb => xenomai_3.0.13.bb} (100%)
rename recipes-xenomai/xenomai/{xenomai_3.1.2.bb => xenomai_3.1.3.bb} (100%)
rename recipes-xenomai/xenomai/{xenomai_3.2.1.bb => xenomai_3.2.2.bb} (100%)conf/distro/include/xenomai-version.inc +4 -4
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019-2022 +# Copyright (c) Siemens AG, 2019-2023 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -11,13 +11,13 @@ XENOMAI_DEFAULT_KERNEL_VERSION = "5.15%" -XENOMAI_3_0_VERSION_LIST = "3.0 3.0% 3.0.% 3.0.12 stable-3.0.x" +XENOMAI_3_0_VERSION_LIST = "3.0 3.0% 3.0.% 3.0.13 stable-3.0.x" XENOMAI_3_0_KERNEL_VERSION = "4.4%" -XENOMAI_3_1_VERSION_LIST = "3.1 3.1% 3.1.% 3.1.2 stable-3.1.x" +XENOMAI_3_1_VERSION_LIST = "3.1 3.1% 3.1.% 3.1.3 stable-3.1.x" XENOMAI_3_1_KERNEL_VERSION = "5.4%" -XENOMAI_3_2_VERSION_LIST = "3.2 3.2% 3.2.% 3.2.1 stable-3.2.x" +XENOMAI_3_2_VERSION_LIST = "3.2 3.2% 3.2.% 3.2.2 stable-3.2.x" XENOMAI_3_2_KERNEL_VERSION = "5.10%" # If PREFERRED_VERSION_xenomai contains any item from XENOMAI_3_0_VERSION_LIST use
recipes-xenomai/xenomai/xenomai_3.0.13.bb renamed from recipes-xenomai/xenomai/xenomai_3.0.12.bb +0 -0
recipes-xenomai/xenomai/xenomai_3.1.3.bb renamed from recipes-xenomai/xenomai/xenomai_3.1.2.bb +0 -0
recipes-xenomai/xenomai/xenomai_3.2.2.bb renamed from recipes-xenomai/xenomai/xenomai_3.2.1.bb +0 -0
Signature · 1 line
2.35.3
PATCH 3/3 start-qemu: Start with read-writable rootfs
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This is needed by systemd to initialize the machine ID on first boot.
--- start-qemu.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
start-qemu.sh +3 -3
@@ -33,7 +33,7 @@ case "$1" in -device virtio-net-pci,netdev=net" KERNEL_SUFFIX="vmlinuz" KERNEL_CMDLINE=" \ - root=/dev/sda vga=0x305" + root=/dev/sda rw vga=0x305" ;; arm64|aarch64) DISTRO_ARCH=arm64
@@ -48,7 +48,7 @@ case "$1" in -device virtio-net-device,netdev=net" KERNEL_SUFFIX="vmlinux" KERNEL_CMDLINE=" \ - root=/dev/vda" + root=/dev/vda rw" ;; arm|armhf) DISTRO_ARCH=armhf
@@ -63,7 +63,7 @@ case "$1" in -device virtio-net-device,netdev=net" KERNEL_SUFFIX="vmlinuz" KERNEL_CMDLINE=" \ - root=/dev/vda" + root=/dev/vda rw" ;; ""|--help) usage
Signature · 1 line
2.35.3
Re: [xenomai-images][PATCH 3/3] start-qemu: Start with read-writable rootfs
Quoted 3 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
This is needed by systemd to initialize the machine ID on first boot.
I'm not facing any problem regarding the machine-ID here, but the LAVA tests are failing like this:
2023-01-04T15:10:03 [?2004lmkdir: cannot create directory ‘/lava-6952’: Read-only file system
So, in addition to the qemu-script we might have to update the job templates for the qemu tests as well.
I already added "rw" to the qemu kernel cmdline in my local branch, but I updated to Debian 12 here and up to now was sure that this is something Debian 12 specific. I have no glue what changed in the test setup / LAVA installation that "rw" is necessary now. Any ideas?
Regards,
Florian
Re: [xenomai-images][PATCH 3/3] start-qemu: Start with read-writable rootfs
Quoted 8 lines · Florian Bezdeka
Quoted 3 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
This is needed by systemd to initialize the machine ID on first boot.
I'm not facing any problem regarding the machine-ID here, but the LAVA tests are failing like this:
I got
Welcome to Debian GNU/Linux 11 (bullseye)!
[ 12.650423] systemd[1]: Set hostname to <demo>. [ 12.651334] systemd[1]: System cannot boot: Missing /etc/machine-id and /etc is mounted read-only. [ 12.651709] systemd[1]: Booting up is supported only when: [ 12.651992] systemd[1]: 1) /etc/machine-id exists and is populated. [ 12.652296] systemd[1]: 2) /etc/machine-id exists and is empty. [ 12.652595] systemd[1]: 3) /etc/machine-id is missing and /etc is writable. [ 21.224091] systemd[1]: Invalid unit [email protected] symlink multi-user.target.wants/[email protected]. [ 21.224776] systemd[1]: Invalid unit [email protected] symlink multi-user.target.wants/[email protected]. [ 21.226480] systemd[1]: Invalid unit [email protected] symlink multi-user.target.wants/[email protected]. [ 21.228235] systemd[1]: Failed to populate /etc with preset unit settings, ignoring: Read-only file system
with a qemu-arm image before this change.
Quoted 9 lines
2023-01-04T15:10:03 [?2004lmkdir: cannot create directory ‘/lava-6952’: Read-only file systemSo, in addition to the qemu-script we might have to update the job templates for the qemu tests as well.
I already added "rw" to the qemu kernel cmdline in my local branch, but I updated to Debian 12 here and up to now was sure that this is something Debian 12 specific. I have no glue what changed in the test setup / LAVA installation that "rw" is necessary now. Any ideas?
That's more a question for Quirin, I do not even know when that mkdir comes from.
Jan
Signature · 2 lines
Siemens AG, Technology Competence Center Embedded Linux
Re: [xenomai-images][PATCH 3/3] start-qemu: Start with read-writable rootfs
Quoted 32 lines · Jan Kiszka
Quoted 8 lines · Florian Bezdeka
Quoted 3 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
This is needed by systemd to initialize the machine ID on first boot.
I'm not facing any problem regarding the machine-ID here, but the LAVA tests are failing like this:
I got
Welcome to Debian GNU/Linux 11 (bullseye)!
[ 12.650423] systemd[1]: Set hostname to <demo>. [ 12.651334] systemd[1]: System cannot boot: Missing /etc/machine-id and /etc is mounted read-only. [ 12.651709] systemd[1]: Booting up is supported only when: [ 12.651992] systemd[1]: 1) /etc/machine-id exists and is populated. [ 12.652296] systemd[1]: 2) /etc/machine-id exists and is empty. [ 12.652595] systemd[1]: 3) /etc/machine-id is missing and /etc is writable. [ 21.224091] systemd[1]: Invalid unit [email protected] symlink multi-user.target.wants/[email protected]. [ 21.224776] systemd[1]: Invalid unit [email protected] symlink multi-user.target.wants/[email protected]. [ 21.226480] systemd[1]: Invalid unit [email protected] symlink multi-user.target.wants/[email protected]. [ 21.228235] systemd[1]: Failed to populate /etc with preset unit settings, ignoring: Read-only file systemwith a qemu-arm image before this change.
Quoted 5 lines
2023-01-04T15:10:03 [?2004lmkdir: cannot create directory ‘/lava-6952’: Read-only file systemSo, in addition to the qemu-script we might have to update the job templates for the qemu tests as well.
Quoted 7 lines
Quoted 4 lines
I already added "rw" to the qemu kernel cmdline in my local branch, but I updated to Debian 12 here and up to now was sure that this is something Debian 12 specific. I have no glue what changed in the test setup / LAVA installation that "rw" is necessary now. Any ideas?
That's more a question for Quirin, I do not even know when that mkdir comes from.
This mkdir is coming from the LAVA preparation steps. So LAVA requires the rootfs to be writable. Might be a configuration topic.
Started some test runs here (internally) as the latest test run on public next branch was successful today.
The only difference here is a Isar update. Let's wait for the test results. I will investigate further.
Quoted 3 lines
Jan