4 files changed, 21 insertions, 48 deletions

diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index a67cc80..9820724 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -1,6 +1,6 @@
 # Image to use with u-boot as BIOS and OSTree deployment system
 
-inherit image_types
+#inherit image_types
 
 # Boot filesystem size in MiB
 # OSTree updates may require some space on boot file system for
@@ -9,12 +9,15 @@ inherit image_types
 BOOTFS_EXTRA_SIZE ?= "512"
 export BOOTFS_EXTRA_SIZE
 
-IMAGE_TYPES += " otaimg"
-IMAGE_DEPENDS_ota = "e2fsprogs-native \
-                     virtual/bootloader \
-                     virtual/kernel \
-                     parted-native \
-                     ${INITRD_IMAGE}"
+do_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \
+                       parted-native:do_populate_sysroot \
+                       virtual/kernel:do_deploy \
+                       ${INITRD_IMAGE}:do_rootfs \
+                       ${PN}:do_rootfs"
+
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4"
+INITRD_IMAGE ?= "core-image-minimal-initramfs"
+INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
 
 build_bootfs () {
         KERNEL_FILE=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} 
@@ -36,7 +39,7 @@ build_bootfs () {
         rm -rf $BOOTTMP
 }
 
-IMAGE_CMD_otaimg () {
+do_otaimg () {
         BOOTIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaboot.ext4
         rm -f $BOOTIMG
         build_bootfs $BOOTIMG
@@ -70,4 +73,8 @@ IMAGE_CMD_otaimg () {
         ln -s ${IMAGE_NAME}.otaimg ${IMAGE_LINK_NAME}.otaimg
 }
 
+addtask otaimg before do_build
+
+IMAGE_TYPES += " otaimg"
+IMAGE_TYPES_MASKED += "otaimg"
 IMAGE_TYPEDEP_otaimg = "ext4"
diff --git a/conf/machine/qemux86-ota.conf b/conf/machine/qemux86-ota.conf
deleted file mode 100644
index 3c58870..0000000
--- a/conf/machine/qemux86-ota.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#@TYPE: Machine
-#@NAME: common_pc
-#@DESCRIPTION: Machine configuration for running a common x86
-
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/tune-i586.inc
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-buildrom"
-UBOOT_MACHINE = "qemu-x86_defconfig"
-
-IMAGE_CLASSES += "image_types_ota"
-IMAGE_FSTYPES += "otaimg"
-
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
-
-XSERVER = "xserver-xorg \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
-           xf86-input-vmmouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-video-cirrus \
-           xf86-video-fbdev \
-           xf86-video-vmware"
-
-MACHINE_FEATURES += "x86"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
-
-MACHINEOVERRIDES .= ":qemux86"
-KMACHINE = "qemux86"
diff --git a/recipes-bsp/u-boot/u-boot-buildrom/0001-Set-up-environment-for-OSTree-integration.patch b/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
index c33d40c..c33d40c 100644
--- a/recipes-bsp/u-boot/u-boot-buildrom/0001-Set-up-environment-for-OSTree-integration.patch
+++ b/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
diff --git a/recipes-bsp/u-boot/u-boot-buildrom_2016.07.bb b/recipes-bsp/u-boot/u-boot-ota_2016.07.bb
index 7e3c67f..8f0b20a 100644
--- a/recipes-bsp/u-boot/u-boot-buildrom_2016.07.bb
+++ b/recipes-bsp/u-boot/u-boot-ota_2016.07.bb
@@ -13,7 +13,10 @@ SRC_URI += "file://0001-Set-up-environment-for-OSTree-integration.patch"
 
 PV = "v2016.07+git${SRCPV}"
 
-EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline BUILD_ROM=y"
-
-UBOOT_SUFFIX = "rom"
+EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline"
+EXTRA_OEMAKE_append_qemux86 = " KCFLAGS=-fgnu89-inline BUILD_ROM=y"
+EXTRA_OEMAKE_append_qemux86-64 = " KCFLAGS=-fgnu89-inline BUILD_ROM=y"
 
+UBOOT_SUFFIX = "bin"
+UBOOT_SUFFIX_qemux86 = "rom"
+UBOOT_SUFFIX_qemux86-64 = "rom"