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 | |
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>
-rw-r--r-- | conf/distro/b2qt.conf | 5 | ||||
-rw-r--r-- | conf/distro/include/fsl.inc | 5 | ||||
-rw-r--r-- | conf/distro/include/intel-corei7-64.conf | 5 | ||||
-rw-r--r-- | conf/distro/include/raspberrypi.inc | 5 | ||||
-rw-r--r-- | 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" | |||
81 | IMAGE_FSTYPES = "conf" | 81 | IMAGE_FSTYPES = "conf" |
82 | IMAGE_CLASSES += "image_types_sdcard deploy-conf" | 82 | IMAGE_CLASSES += "image_types_sdcard deploy-conf" |
83 | 83 | ||
84 | QBSP_IMAGE_CONTENT ?= "\ | ||
85 | ${IMAGE_LINK_NAME}.img \ | ||
86 | ${IMAGE_LINK_NAME}.conf \ | ||
87 | " | ||
88 | |||
89 | LICENSE_CREATE_PACKAGE = "1" | 84 | LICENSE_CREATE_PACKAGE = "1" |
90 | COPY_LIC_MANIFEST = "1" | 85 | COPY_LIC_MANIFEST = "1" |
91 | 86 | ||
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" | |||
31 | 31 | ||
32 | IMAGE_FSTYPES += "ext3 sdcard" | 32 | IMAGE_FSTYPES += "ext3 sdcard" |
33 | IMAGE_CLASSES += "image_types_fsl" | 33 | IMAGE_CLASSES += "image_types_fsl" |
34 | |||
35 | QBSP_IMAGE_CONTENT ?= "\ | ||
36 | ${IMAGE_LINK_NAME}.img \ | ||
37 | ${IMAGE_LINK_NAME}.conf \ | ||
38 | " | ||
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" | |||
36 | IMAGE_CLASSES += "image_dd_efi" | 36 | IMAGE_CLASSES += "image_dd_efi" |
37 | IMAGE_FSTYPES += "ext3 dd" | 37 | IMAGE_FSTYPES += "ext3 dd" |
38 | 38 | ||
39 | QBSP_IMAGE_CONTENT ?= "\ | ||
40 | ${IMAGE_LINK_NAME}.img \ | ||
41 | ${IMAGE_LINK_NAME}.conf \ | ||
42 | " | ||
43 | |||
39 | INITRAMFS_IMAGE = "initramfs-basic" | 44 | INITRAMFS_IMAGE = "initramfs-basic" |
40 | 45 | ||
41 | SYSVINIT_ENABLED_GETTYS = "1" | 46 | 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 @@ | |||
29 | 29 | ||
30 | IMAGE_FSTYPES += "ext3 rpi-sdimg" | 30 | IMAGE_FSTYPES += "ext3 rpi-sdimg" |
31 | 31 | ||
32 | QBSP_IMAGE_CONTENT ?= "\ | ||
33 | ${IMAGE_LINK_NAME}.img \ | ||
34 | ${IMAGE_LINK_NAME}.conf \ | ||
35 | " | ||
36 | |||
32 | MACHINE_EXTRA_INSTALL += "\ | 37 | MACHINE_EXTRA_INSTALL += "\ |
33 | omxplayer \ | 38 | omxplayer \ |
34 | " | 39 | " |
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" |