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/include/raspberrypi.inc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'conf/distro/include/raspberrypi.inc')

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 \
         "
-- 
cgit v1.2.3-54-g00ecf