diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-04 17:35:10 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-10 08:11:27 +0000 |
| commit | 735cec6f6c2eee29dc69f2a1609f7d92f3e56e4a (patch) | |
| tree | f5bbaa493ce3bfe301e4d22b16580eaedea721a9 /conf/distro/include/rcar-gen2.inc | |
| parent | 9585a16c9668f8aacba7ce72d5061fc38c4745e0 (diff) | |
| download | meta-boot2qt-735cec6f6c2eee29dc69f2a1609f7d92f3e56e4a.tar.gz | |
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>
Diffstat (limited to 'conf/distro/include/rcar-gen2.inc')
| -rw-r--r-- | conf/distro/include/rcar-gen2.inc | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ | |||
| 55 | # $ bitbake b2qt-embedded-image | 55 | # $ bitbake b2qt-embedded-image |
| 56 | # | 56 | # |
| 57 | 57 | ||
| 58 | include conf/distro/include/fsl.inc | ||
| 59 | |||
| 58 | # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI | 60 | # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI |
| 59 | FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:" | 61 | FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:" |
| 60 | 62 | ||
| @@ -70,9 +72,6 @@ GLES_DRIVER_r8a7790 = "rgx" | |||
| 70 | DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib" | 72 | DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib" |
| 71 | MACHINE_FEATURES += "multimedia ${GLES_DRIVER}" | 73 | MACHINE_FEATURES += "multimedia ${GLES_DRIVER}" |
| 72 | 74 | ||
| 73 | IMAGE_FSTYPES += "ext3 sdcard" | ||
| 74 | IMAGE_CLASSES += "image_types_fsl" | ||
| 75 | |||
| 76 | PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3" | 75 | PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3" |
| 77 | 76 | ||
| 78 | PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" | 77 | PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" |