From 55850b3c23c7a21190828bd8011d01291e67a32c Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Wed, 17 Jan 2024 22:33:34 +0100 Subject: [PATCH 1/5] qemux86: qemux86-grub-efi.wks: increase rootfs partition size The current core-image-minimal size for the suggested configuration seems to be too close to 150M and test images fail to boot. Fix this by adding 50M more for each rootfs partition. There is also no need to pre-populate the inactive rootfs, thus use --source empty here. Signed-off-by: Enrico Jorns --- meta-rauc-qemux86/wic/qemux86-grub-efi.wks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-rauc-qemux86/wic/qemux86-grub-efi.wks b/meta-rauc-qemux86/wic/qemux86-grub-efi.wks index 4aa1bb5..e0f7ce4 100644 --- a/meta-rauc-qemux86/wic/qemux86-grub-efi.wks +++ b/meta-rauc-qemux86/wic/qemux86-grub-efi.wks @@ -12,6 +12,6 @@ part --fixed-size 50M --source rawcopy --sourceparams="file=efi-boot.vfat" --fst part --fixed-size 50M --ondisk sda --align 4096 --no-table part --fixed-size 10M --source rawcopy --sourceparams="file=grubenv.vfat" --fstype=vfat --ondisk sda --label grubenv --align 1024 part /rescue --source rootfs --ondisk sda --fstype=ext4 --label rescue --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label root_a --fixed-size=150M --align 4096 -part / --source rootfs --ondisk sda --fstype=ext4 --label root_b --fixed-size=150M --align 4096 +part / --source rootfs --ondisk sda --fstype=ext4 --label root_a --fixed-size=200M --align 4096 +part / --source empty --ondisk sda --fstype=ext4 --label root_b --fixed-size=200M --align 4096 part /data --fixed-size 100M --ondisk sda --fstype=ext4 --label data --align 4096 From fb536c9d28825eefdb6a92f2eda0816baa3b1866 Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Sun, 7 Jan 2024 23:38:41 +0100 Subject: [PATCH 2/5] qemux86: rauc: migrate to rauc-conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With meta-rauc commit d51bab8f ("rauc: split package into 'rauc' for binary and 'rauc-conf' for configuration"), the platform-specific configuration was moved to the rauc-conf.bb recipe. As we only touch the configuration anyway, adapt to this by simply renaming the .bbappend. Signed-off-by: Enrico Jörns --- .../recipes-core/rauc/{rauc_%.bbappend => rauc-conf.bbappend} | 0 .../recipes-core/rauc/{rauc_rauc.inc => rauc-conf_rauc.inc} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename meta-rauc-qemux86/recipes-core/rauc/{rauc_%.bbappend => rauc-conf.bbappend} (100%) rename meta-rauc-qemux86/recipes-core/rauc/{rauc_rauc.inc => rauc-conf_rauc.inc} (100%) diff --git a/meta-rauc-qemux86/recipes-core/rauc/rauc_%.bbappend b/meta-rauc-qemux86/recipes-core/rauc/rauc-conf.bbappend similarity index 100% rename from meta-rauc-qemux86/recipes-core/rauc/rauc_%.bbappend rename to meta-rauc-qemux86/recipes-core/rauc/rauc-conf.bbappend diff --git a/meta-rauc-qemux86/recipes-core/rauc/rauc_rauc.inc b/meta-rauc-qemux86/recipes-core/rauc/rauc-conf_rauc.inc similarity index 100% rename from meta-rauc-qemux86/recipes-core/rauc/rauc_rauc.inc rename to meta-rauc-qemux86/recipes-core/rauc/rauc-conf_rauc.inc From 726128662e03b9648f82e5a74d1a90eee39cee95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20J=C3=B6rns?= Date: Thu, 23 May 2024 23:36:38 +0200 Subject: [PATCH 3/5] qemux86: layer.conf: update compatibility to 'scarthgap' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to the rauc-conf change, the layer will not be compatible with any version before. Drop these. Signed-off-by: Enrico Jörns --- meta-rauc-qemux86/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-rauc-qemux86/conf/layer.conf b/meta-rauc-qemux86/conf/layer.conf index de26c0c..c5b7890 100644 --- a/meta-rauc-qemux86/conf/layer.conf +++ b/meta-rauc-qemux86/conf/layer.conf @@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-rauc-qemux86 = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-rauc-qemux86 = "6" LAYERDEPENDS_meta-rauc-qemux86 = "core" -LAYERSERIES_COMPAT_meta-rauc-qemux86 = "kirkstone nanbield" +LAYERSERIES_COMPAT_meta-rauc-qemux86 = "scarthgap" From cf289721485eb6d8082bbda619457cd7a4f8d62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20J=C3=B6rns?= Date: Mon, 27 May 2024 09:28:20 +0200 Subject: [PATCH 4/5] qemux86: remove compatibility with 'scarthgap' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We will need to do some incompatible changes now. Signed-off-by: Enrico Jörns --- meta-rauc-qemux86/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-rauc-qemux86/conf/layer.conf b/meta-rauc-qemux86/conf/layer.conf index c5b7890..69aa53b 100644 --- a/meta-rauc-qemux86/conf/layer.conf +++ b/meta-rauc-qemux86/conf/layer.conf @@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-rauc-qemux86 = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-rauc-qemux86 = "6" LAYERDEPENDS_meta-rauc-qemux86 = "core" -LAYERSERIES_COMPAT_meta-rauc-qemux86 = "scarthgap" +LAYERSERIES_COMPAT_meta-rauc-qemux86 = "styhead" From aceeb142c2976f19f91aa62942be092d9d853253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20J=C3=B6rns?= Date: Sun, 26 May 2024 00:42:20 +0200 Subject: [PATCH 5/5] qemux86: rauc-qemu-grubconf: Switch away from S = WORKDIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reflects the recent changes in oe-core to enforce unpacking to a subdirectory of WORKDIR. As done in oe-core commit d9328e3b ("recipes: Switch away from S = WORKDIR"), use explicit 'sources/' subdirectory as UNPACKDIR (and S). Signed-off-by: Enrico Jörns --- meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb b/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb index 5a30063..342e6df 100644 --- a/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb +++ b/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb @@ -11,20 +11,21 @@ SRC_URI += " \ file://grubenv \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit deploy do_install() { install -d ${D}${EFI_FILES_PATH} - install -m 644 ${WORKDIR}/grub.cfg ${D}${EFI_FILES_PATH}/grub.cfg + install -m 644 ${S}/grub.cfg ${D}${EFI_FILES_PATH}/grub.cfg } FILES:${PN} += "${EFI_FILES_PATH}" do_deploy() { - install -m 644 ${WORKDIR}/grub.cfg ${DEPLOYDIR} - install -m 644 ${WORKDIR}/grubenv ${DEPLOYDIR} + install -m 644 ${S}/grub.cfg ${DEPLOYDIR} + install -m 644 ${S}/grubenv ${DEPLOYDIR} } addtask deploy after do_install before do_build