Skip to contentSkip to conversation

genericx86: wic wks do not hardcode loader

PATCH In review Lee Chee Yang 2 participants 3 messages Nov 27, 2019 – Nov 28, 2019 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 genericx86: wic wks do not hardcode loader

From: Chee Yang Lee <[email protected]>

replace .wks with .wks.in and refer loader to EFI_PROVIDER to enable different bootloader.

---
 meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 +-
 meta-yocto-bsp/wic/genericx86.wks                         | 7 -------
 meta-yocto-bsp/wic/genericx86.wks.in                      | 7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 meta-yocto-bsp/wic/genericx86.wks
 create mode 100644 meta-yocto-bsp/wic/genericx86.wks.in
meta-yocto-bsp/conf/machine/include/genericx86-common.inc +1 -1
index f83ce5c..5db91be 100644
@@ -20,6 +20,6 @@ GLIBC_ADDONS = "nptl"
 EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
 
 IMAGE_FSTYPES += "wic wic.bmap"
-WKS_FILE ?= "genericx86.wks"
+WKS_FILE ?= "genericx86.wks.in"
 do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot"
 do_image_wic[recrdeptask] += "do_bootimg"
meta-yocto-bsp/wic/genericx86.wks deleted +0 -7
deleted file mode 100644
index dab719c..0000000
@@ -1,7 +0,0 @@
-# short-description: Create an EFI disk image for genericx86*
-# long-description: Creates a partitioned EFI disk image for genericx86* machines
-part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024
-part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
-part swap --ondisk sda --size 44 --label swap1 --fstype=swap
-
-bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0"
meta-yocto-bsp/wic/genericx86.wks.in new file +7 -0
new file mode 100644
index 0000000..7c09ad0
@@ -0,0 +1,7 @@
+# short-description: Create an EFI disk image for genericx86*
+# long-description: Creates a partitioned EFI disk image for genericx86* machines
+part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --ondisk sda --label msdos --active --align 1024
+part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap
+
+bootloader --ptable gpt --timeout=5 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0"
Signature · 1 line
2.7.4
#1 lore raw
Quoted 4 lines · Lee Chee Yang

From: Chee Yang Lee <[email protected]>

replace .wks with .wks.in and refer loader to EFI_PROVIDER to enable different bootloader.

Fails on the autobuilder:

ERROR: core-image-minimal-initramfs-1.0-r0 do_image_wic: Execution of '/home/pokybuild/yocto-worker/genericx86/build/build/tmp/work/genericx86-poky-linux/core-image-minimal-initramfs/1.0-r0/temp/run.do_image_wic.24049' failed with exit code 1:
INFO: Creating image(s)...
ERROR: unrecognized bootimg-efi loader:
WARNING: exit code 1 from a shell command.
NOTE: recipe wpa-supplicant-2.9-r0: task do_package_write_ipk: Succeeded

Ross

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 6 lines · Ross Burton
Quoted 4 lines · Lee Chee Yang

From: Chee Yang Lee <[email protected]>

replace .wks with .wks.in and refer loader to EFI_PROVIDER to enable different bootloader.

Quoted 7 lines

Fails on the autobuilder:

ERROR: core-image-minimal-initramfs-1.0-r0 do_image_wic: Execution of '/home/pokybuild/yocto-worker/genericx86/build/build/tmp/work/genericx86-poky-linux/core-image-minimal-initramfs/1.0-r0/temp/run.do_image_wic.24049' failed with exit code 1:
INFO: Creating image(s)...
ERROR: unrecognized bootimg-efi loader:
WARNING: exit code 1 from a shell command.
NOTE: recipe wpa-supplicant-2.9-r0: task do_package_write_ipk: Succeeded

Far to vague, sorry.

Build run was https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/1295

MACHINE=genericx86-64, full logs in step1b.

Ross