From 57a963f2bb71bc78f733060c7480a361e7ac4d40 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Tue, 13 Sep 2016 18:36:26 +0200
Subject: uefi boot dislikes size in genimage, use a dummy image for cfgfs, add
 dependencies

---
 mk/image.mk                            | 1 +
 package/util-linux/Makefile            | 1 +
 target/x86_64/qemu-x86_64/genimage.cfg | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/mk/image.mk b/mk/image.mk
index 890574449..5622d4212 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -274,6 +274,7 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
 ${FW_DIR}/${GENIMAGE}: ${TARGET_DIR} kernel-package
 	@rm -rf ${FW_DIR}/temp
 	@mkdir -p ${FW_DIR}/temp
+	@dd if=/dev/zero of=${FW_DIR}/cfgfs.img bs=16M count=1 $(MAKE_TRACE)
 	PATH='${HOST_PATH}' mke2img \
 		-G 4 \
 		-d "$(TARGET_DIR)" \
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 92dad3e44..942aaf39f 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -10,6 +10,7 @@ PKG_HASH:=		b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		ncurses
+HOST_BUILDDEP:=		autoconf-host automake-host libtool-host pkgconf-host
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.28/
 PKG_OPTS:=		dev
 PKG_NEEDS:=		threads rt
diff --git a/target/x86_64/qemu-x86_64/genimage.cfg b/target/x86_64/qemu-x86_64/genimage.cfg
index 5a5479fbd..a59d75e47 100644
--- a/target/x86_64/qemu-x86_64/genimage.cfg
+++ b/target/x86_64/qemu-x86_64/genimage.cfg
@@ -22,4 +22,9 @@ image disk.img {
     image = "rootfs.ext"
   }
 
+  partition cfgfs {
+    partition-type = 0x88
+    image = "cfgfs.img"
+  }
+
 }
-- 
cgit v1.2.3