From daccfddd693b9a89f459386e197fe5204d451f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 1 Mar 2024 10:21:07 +0100 Subject: [PATCH 1/2] meta-ptx: update to current master with genimage v17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version of genimage brings fill= support for partitions, so we can drop our workaround using zeroed image file. Signed-off-by: Leonard Göhrs --- .../recipes-core/images/emmc-image.bb | 17 ----------------- .../images/emmc-image/lxatac/genimage.config | 4 ++-- meta-ptx | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/meta-lxatac-bsp/recipes-core/images/emmc-image.bb b/meta-lxatac-bsp/recipes-core/images/emmc-image.bb index 0b4baea4..b7fd6d70 100644 --- a/meta-lxatac-bsp/recipes-core/images/emmc-image.bb +++ b/meta-lxatac-bsp/recipes-core/images/emmc-image.bb @@ -13,23 +13,6 @@ COMPATIBLE_MACHINE = "lxatac" GENIMAGE_IMAGE_SUFFIX = "" -# This can be removed once we have a genimage with fill= support -GENIMAGE_VARIABLES[WORKDIR] = "${WORKDIR}" - -do_configure:append() { - # This can be removed once we have a genimage with fill= support. - # Just using /dev/zero in the genimage config does not work because ... - # - # $ python3 - # >>> import os - # >>> os.stat("/dev/zero") - # os.stat_result(st_mode=8630 ... st_size=0 ..) - # - # ... /dev/zero has 0 size and genimage only writes st_size bytes of - # the file into the image and leaves the rest sparse. - dd if=/dev/zero bs=1024 count=256 of=${WORKDIR}/state-filler.img -} - do_genimage[depends] += " \ lxatac-core-image-base:do_image_complete \ " diff --git a/meta-lxatac-bsp/recipes-core/images/emmc-image/lxatac/genimage.config b/meta-lxatac-bsp/recipes-core/images/emmc-image/lxatac/genimage.config index 6610e0ac..dccd67d7 100644 --- a/meta-lxatac-bsp/recipes-core/images/emmc-image/lxatac/genimage.config +++ b/meta-lxatac-bsp/recipes-core/images/emmc-image/lxatac/genimage.config @@ -11,14 +11,14 @@ image @IMAGE@img { } partition barebox-env { - image = "@WORKDIR@/state-filler.img" + fill = true in-partition-table = false offset = 512K size = 256K } partition barebox-state { - image = "@WORKDIR@/state-filler.img" + fill = true # We can not have the barebox partitions in the partition table right # now because: # - If we add them the partition label clashes with the label of the diff --git a/meta-ptx b/meta-ptx index 23f79905..6ffe1d91 160000 --- a/meta-ptx +++ b/meta-ptx @@ -1 +1 @@ -Subproject commit 23f79905239f0dae2bb6736e7691a3080bac23dd +Subproject commit 6ffe1d91e80a4221e801c761e7a6707deec33394 From f4aa74e429734507d7d62236c95cfb1be63cd9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 1 Mar 2024 10:22:59 +0100 Subject: [PATCH 2/2] meta-{oe, rauc, virtualization}, poky: update to recent nanbield/master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No particularly interesting changes, just regular maintainance. Signed-off-by: Leonard Göhrs --- meta-oe | 2 +- meta-rauc | 2 +- meta-virtualization | 2 +- poky | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe b/meta-oe index 2da6e1b0..da9063bd 160000 --- a/meta-oe +++ b/meta-oe @@ -1 +1 @@ -Subproject commit 2da6e1b0e43a8993fd422fee3f83940100b59f4c +Subproject commit da9063bdfbe130f424ba487f167da68e0ce90e7d diff --git a/meta-rauc b/meta-rauc index f6b3fcd2..96b542b6 160000 --- a/meta-rauc +++ b/meta-rauc @@ -1 +1 @@ -Subproject commit f6b3fcd20bc08be8bb41a93feffd94b1626b3c6c +Subproject commit 96b542b68d613dca75e4f06e68b71ea82de906bb diff --git a/meta-virtualization b/meta-virtualization index 9e92984f..ac125d88 160000 --- a/meta-virtualization +++ b/meta-virtualization @@ -1 +1 @@ -Subproject commit 9e92984ff47b3ca2106b1d27a93af061b28d1e8a +Subproject commit ac125d881f34ff356390e19e02964f8980d4ec38 diff --git a/poky b/poky index dbc8727b..1a5c00f0 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit dbc8727beafe689a99d8b371df98b3c842756065 +Subproject commit 1a5c00f00c14cee3ba5d39c8c8db7a9738469eab