From 378ab27c32b6d831d2858281e1444dcc882f87c9 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 17 Feb 2025 14:14:48 +0100 Subject: [PATCH 1/2] recipes-devtool: Add `-n` flag to gzip for lshw Signed-off-by: Pawel Langowski --- meta-dts-distro/recipes-devtool/lshw/lshw_%.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-dts-distro/recipes-devtool/lshw/lshw_%.bbappend diff --git a/meta-dts-distro/recipes-devtool/lshw/lshw_%.bbappend b/meta-dts-distro/recipes-devtool/lshw/lshw_%.bbappend new file mode 100644 index 00000000..abe31408 --- /dev/null +++ b/meta-dts-distro/recipes-devtool/lshw/lshw_%.bbappend @@ -0,0 +1 @@ +EXTRA_OEMAKE += "GZIP='-9 -n'" From 6e7a12c894a3dcfb7641333b51dbc0bc73333a37 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 17 Feb 2025 15:23:59 +0100 Subject: [PATCH 2/2] Use commit SHA for partition UUIDs Signed-off-by: Pawel Langowski --- meta-dts-distro/recipes-dts/images/dts-base-image.inc | 11 +++++++++++ meta-dts-distro/wic/usb-stick-dts.wks.in | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/meta-dts-distro/recipes-dts/images/dts-base-image.inc b/meta-dts-distro/recipes-dts/images/dts-base-image.inc index 6ed64d32..f4bd4878 100644 --- a/meta-dts-distro/recipes-dts/images/dts-base-image.inc +++ b/meta-dts-distro/recipes-dts/images/dts-base-image.inc @@ -21,6 +21,17 @@ IMAGE_INSTALL:append = " \ lshw \ " +LAYER_COMMIT_SHA := "$(cd ${LAYERDIR} && git rev-parse HEAD)" + +BOOT_UUID="${@get_uuid('boot' + d.getVar('LAYER_COMMIT_SHA'))}" +ROOT_UUID="${@get_uuid('root' + d.getVar('LAYER_COMMIT_SHA'))}" + +def get_uuid(string): + import hashlib, uuid + return str(uuid.UUID(hashlib.md5(string.encode()).hexdigest())) + +WICVARS:append = "ROOT_UUID BOOT_UUID" + # Enable local auto-login of the root user (local = serial port and # virtual console) DTS_LOCAL_GETTY ?= " \ diff --git a/meta-dts-distro/wic/usb-stick-dts.wks.in b/meta-dts-distro/wic/usb-stick-dts.wks.in index 2ea47686..c75bbd64 100644 --- a/meta-dts-distro/wic/usb-stick-dts.wks.in +++ b/meta-dts-distro/wic/usb-stick-dts.wks.in @@ -1,4 +1,4 @@ bootloader --timeout=0 --append=" rootwait" -part /boot --source bootimg-biosplusefi --sourceparams="loader=grub-efi" --ondisk sda --label dts-boot --align 1024 --use-uuid --active --system-id 0xef -part / --source rootfs --fstype=ext4 --ondisk sda --label dts-root --align 1024 --use-uuid --fixed-size 1024 +part /boot --source bootimg-biosplusefi --sourceparams="loader=grub-efi" --ondisk sda --label dts-boot --align 1024 --uuid ${BOOT_UUID} --active --system-id 0xef +part / --source rootfs --fstype=ext4 --ondisk sda --label dts-root --align 1024 --uuid ${ROOT_UUID} --fixed-size 1024