wic: Populate hostfw partition

Populate the hostfw partition by specifying the directory to be
used as source for the filesystem. This directory is populated
by a bbappend to the hostfw recipe.

(From meta-aspeed rev: 37f30af4e377a6bc2d3c47ca435798969321f566)

Change-Id: Id64e0ac6a5082be2b3ad689a6b323da8eb094e69
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index 046553b..c30eb6b 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -15,6 +15,7 @@
 
 WKS_FILE ?= "emmc-aspeed.wks.in"
 WKS_FILE_DEPENDS ?= " \
+    phosphor-hostfw-image \
     virtual/bootloader \
     virtual/kernel \
 "
diff --git a/meta-aspeed/wic/emmc-aspeed.wks.in b/meta-aspeed/wic/emmc-aspeed.wks.in
index ace5f47..ee0fbff 100644
--- a/meta-aspeed/wic/emmc-aspeed.wks.in
+++ b/meta-aspeed/wic/emmc-aspeed.wks.in
@@ -27,4 +27,4 @@
 part --fstype=ext4 --fixed-size 1G --source rootfs --label rofs-a
 part --fstype=ext4 --fixed-size 1G --source rootfs --label rofs-b
 part --fstype=ext4 --fixed-size 7G --label rwfs
-part --fstype=ext4 --fixed-size ${WKS_HOSTFW_SIZE} --label hostfw
+part --fstype=ext4 --fixed-size ${WKS_HOSTFW_SIZE} --source rootfs --rootfs-dir=${DEPLOY_DIR_IMAGE}/hostfw/image/ --label hostfw