Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions meta-dts-distro/recipes-devtool/lshw/lshw_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
EXTRA_OEMAKE += "GZIP='-9 -n'"
11 changes: 11 additions & 0 deletions meta-dts-distro/recipes-dts/images/dts-base-image.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to use bootloader --ptable gpt in wks file if you want to use long form of UUID otherwise it'd likely be ignored. MBR uses short UUID.

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 ?= " \
Expand Down
4 changes: 2 additions & 2 deletions meta-dts-distro/wic/usb-stick-dts.wks.in
Original file line number Diff line number Diff line change
@@ -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