From 735cec6f6c2eee29dc69f2a1609f7d92f3e56e4a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 4 Jan 2017 17:35:10 +0200
Subject: qbsp: move the qbsp content definition from distro conf

qbsp-image creation broke builds where MACHINE did not have conf file
distro/include/${MACHINE}.conf, since it was expecting to find .img as
a result of the image build.

Change-Id: I686684f86f94b4c227ba40dd17fd8bb14e705b9d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 conf/distro/b2qt.conf                    | 5 -----
 conf/distro/include/fsl.inc              | 5 +++++
 conf/distro/include/intel-corei7-64.conf | 5 +++++
 conf/distro/include/raspberrypi.inc      | 5 +++++
 conf/distro/include/rcar-gen2.inc        | 5 ++---
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index ce0328c..81cc98b 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -81,11 +81,6 @@ PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
 IMAGE_FSTYPES = "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 
-QBSP_IMAGE_CONTENT ?= "\
-    ${IMAGE_LINK_NAME}.img \
-    ${IMAGE_LINK_NAME}.conf \
-    "
-
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
 
diff --git a/conf/distro/include/fsl.inc b/conf/distro/include/fsl.inc
index d0e2c7a..bdd0b88 100644
--- a/conf/distro/include/fsl.inc
+++ b/conf/distro/include/fsl.inc
@@ -31,3 +31,8 @@ BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 
 IMAGE_FSTYPES += "ext3 sdcard"
 IMAGE_CLASSES += "image_types_fsl"
+
+QBSP_IMAGE_CONTENT ?= "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    "
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index 2ae90ee..3b959a4 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -36,6 +36,11 @@ DISTRO_FEATURES_remove = "usbgadget"
 IMAGE_CLASSES += "image_dd_efi"
 IMAGE_FSTYPES += "ext3 dd"
 
+QBSP_IMAGE_CONTENT ?= "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    "
+
 INITRAMFS_IMAGE = "initramfs-basic"
 
 SYSVINIT_ENABLED_GETTYS = "1"
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index 9d8b526..f980e13 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/conf/distro/include/raspberrypi.inc
@@ -29,6 +29,11 @@
 
 IMAGE_FSTYPES += "ext3 rpi-sdimg"
 
+QBSP_IMAGE_CONTENT ?= "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    "
+
 MACHINE_EXTRA_INSTALL += "\
         omxplayer \
         "
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 9a33319..2768f88 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -55,6 +55,8 @@
 #   $ bitbake b2qt-embedded-image
 #
 
+include conf/distro/include/fsl.inc
+
 # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI
 FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:"
 
@@ -70,9 +72,6 @@ GLES_DRIVER_r8a7790 = "rgx"
 DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib"
 MACHINE_FEATURES += "multimedia ${GLES_DRIVER}"
 
-IMAGE_FSTYPES += "ext3 sdcard"
-IMAGE_CLASSES += "image_types_fsl"
-
 PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3"
 
 PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
-- 
cgit v1.2.3-54-g00ecf