WIP: esp-qcom-image: convert to OE-core uki.bbclass

classes/uki-esp-image.bbclass

@@ -0,0 +1,16 @@
+# Create an ESP image that has a type #2 EFI UKI and systemd-boot
+
+# Optional subfolder, dependant on where the ESP partition gets mounted
+# intended to only have a leading slash, no trailing slash e.g. '/EFI', or just empty, ''
+ESPFOLDER ?= "/EFI"
+
+do_ukiesp() {
+	mkdir -p ${IMAGE_ROOTFS}${ESPFOLDER}/EFI/Linux
+
+	# Copy over files from deploy into the rootfs
+	install -m 0755 ${DEPLOY_DIR_IMAGE}/${UKI_FILENAME} ${IMAGE_ROOTFS}${ESPFOLDER}/EFI/Linux
+}
+
+addtask ukiesp after do_deploy uki before do_image_complete do_image_wic
+
+

recipes-kernel/images/esp-qcom-image.bb

@@ -1,14 +1,25 @@
 DESCRIPTION = "EFI System Partition Image to boot Qualcomm boards"
 
 PACKAGE_INSTALL = " \
-    linux-qcom-uki \
     systemd-boot \
 "
 
 KERNELDEPMODDEPEND = ""
 KERNEL_DEPLOY_DEPEND = ""
 
-inherit image
+ESPFOLDER = ""
+inherit image uki-esp-image
+
+inherit uki
+UKI_FILENAME = "${EFI_LINUX_IMG}"
+
+UKI_CMDLINE="root=${QCOM_BOOTIMG_ROOTFS} rw rootwait"
+
+# Remove leading 'qcom/' from KERNEL_DEVICEREE, we store the file in DEPLOY_DIR_IMAGE directly, not in the qcom/ subfolder
+#KERNEL_DEVICETREE := "${@d.getVar('KERNEL_DEVICETREE').strip().replace('qcom/','')}"
+
+# Remove 'upstream' dtb, rely on EFI provided one
+KERNEL_DEVICETREE = ""
 
 IMAGE_FSTYPES = "vfat"
 IMAGE_FSTYPES_DEBUGFS = ""