b2qt: initial commit for 6.2 renesas builds

Change-Id: Ifdea1d142c0af1944aa7cd2736787d450c471e8c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

8 files changed, 8 insertions, 125 deletions

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 01547ea..5979cb7 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -50,6 +50,6 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-boot2qt-renesas \
   ${BSPDIR}/sources/meta-mingw \
-  ${BSPDIR}/sources/meta-qt5 \
+  ${BSPDIR}/sources/meta-qt6 \
   "
 
diff --git a/conf/distro/include/b2qt.inc b/conf/distro/include/b2qt.inc
index 92f80ba..ef4ea28 100644
--- a/conf/distro/include/b2qt.inc
+++ b/conf/distro/include/b2qt.inc
@@ -32,7 +32,8 @@ DEPLOY_CONF_NAME_m3ulcb     = "Renesas R-Car-M3 Starter Kit Pro"
 DEPLOY_CONF_NAME_h3ulcb     = "Renesas R-Car-H3 Starter Kit Premier"
 DEPLOY_CONF_NAME_salvator-x = "Renesas R-Car H3 M3 Salvator-X(S)"
 
-IMAGE_FSTYPES += "wic"
+IMAGE_FSTYPES += "wic.xz"
+DEPLOY_CONF_IMAGE_TYPE = "wic.xz"
 WKS_FILE = "sdimage-bootpart.wks"
 WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
 WKS_FILE_DEPENDS += "u-boot optee-os"
@@ -43,7 +44,8 @@ IMAGE_BOOT_FILES = "\
     "
 
 QBSP_IMAGE_CONTENT = "\
-    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} \
+    ${IMAGE_LINK_NAME}.info \
     ${IMAGE_LINK_NAME}.conf \
     bl2-${MACHINE}.srec \
     bl31-${MACHINE}.srec \
@@ -60,6 +62,8 @@ BOOT_SPACE = "32768"
 
 MACHINE_FEATURES_append = " gsx multimedia"
 
+DISTRO_FEATURES_remove = "ld-is-gold"
+
 MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm"
 
 #DISTRO_FEATURES_append = " pam"
@@ -78,7 +82,4 @@ FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar3/${PN}:"
 
 BBMASK += "\
     meta-rcar-gen3/recipes-core/packagegroups \
-    meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend \
-    meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend \
-    meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend \
     "
diff --git a/conf/layer.conf b/conf/layer.conf
index 9f2d64d..eca24d5 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -39,5 +39,5 @@ BBFILE_COLLECTIONS += "b2qt_renesas"
 BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_renesas = "20"
 
-LAYERSERIES_COMPAT_b2qt_renesas = "dunfell"
+LAYERSERIES_COMPAT_b2qt_renesas = "hardknott"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend
deleted file mode 100644
index ac75901..0000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.%.bbappend
+++ /dev/null
@@ -1,43 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:"
-
-SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
-SRC_URI_append = " \
-    git://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3e/1.16.3 \
-    file://gstomx.conf \
-"
-
-require include/rcar-gen3-path-common.inc
-
-DEPENDS += "omx-user-module mmngrbuf-user-module"
-
-# The archiver.bbclass will append a uri to SRC_URI when it contains
-# destsuffix, then the SRC_URI would contain multilib SCMs, and bitbake's
-# fetcher requires a SRCREV_FORMAT for multiple SCMs.
-SRCREV_FORMAT = "${SRCNAME}"
-
-SRCREV = "443da15c564dc12fddfac99eab35470713859982"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-    file://omx/gstomx.h;beginline=1;endline=22;md5=e2c6664eda77dc22095adbed9cb6c6e4 \
-"
-
-S = "${WORKDIR}/git"
-
-GSTREAMER_1_0_OMX_TARGET = "rcar"
-GSTREAMER_1_0_OMX_CORE_NAME = "${libdir}/libomxr_core.so"
-EXTRA_OECONF_append = " --enable-experimental"
-
-do_configure_prepend() {
-    export http_proxy=${http_proxy}
-    export https_proxy=${https_proxy}
-    export HTTP_PROXY=${HTTP_PROXY}
-    export HTTPS_PROXY=${HTTPS_PROXY}
-    cd ${S}
-    install -m 0644 ${WORKDIR}/gstomx.conf ${S}/config/rcar/
-    sed -i 's,@RENESAS_DATADIR@,${RENESAS_DATADIR},g' ${S}/config/rcar/gstomx.conf
-    ./autogen.sh --noconfigure
-    cd ${B}
-}
-
-RDEPENDS_${PN}_append = " omx-user-module"
-RDEPENDS_${PN}_remove = "libomxil"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
deleted file mode 100644
index 2b39c0c..0000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.%.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz"
-SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3e/1.16.3"
-
-# The archiver.bbclass will append a uri to SRC_URI when it contains
-# destsuffix, then the SRC_URI would contain multilib SCMs, and bitbake's
-# fetcher requires a SRCREV_FORMAT for multiple SCMs.
-SRCREV_FORMAT = "${SRCNAME}"
-
-SRCREV = "0b00bd6365ddd87b05242d9d2b08955cf02e474e"
-
-DEPENDS += "weston"
-
-S = "${WORKDIR}/git"
-
-# submodule is extracted before do_populate_lic
-addtask do_init_submodule after do_unpack before do_patch
-
-do_init_submodule() {
-    export http_proxy=${http_proxy}
-    export https_proxy=${https_proxy}
-    export HTTP_PROXY=${HTTP_PROXY}
-    export HTTPS_PROXY=${HTTPS_PROXY}
-    cd ${S}
-    git submodule init
-    git submodule update
-}
-
-do_configure_prepend() {
-    cd ${S}
-    ./autogen.sh --noconfigure
-    cd ${B}
-}
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend
deleted file mode 100644
index 78ae43a..0000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.%.bbappend
+++ /dev/null
@@ -1,37 +0,0 @@
-SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz"
-SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3e/1.16.3"
-
-# The archiver.bbclass will append a uri to SRC_URI when it contains
-# destsuffix, then the SRC_URI would contain multilib SCMs, and bitbake's
-# fetcher requires a SRCREV_FORMAT for multiple SCMs.
-SRCREV_FORMAT = "${SRCNAME}"
-
-SRCREV = "2af969c91be22e2cf71ec1aa81c158171ecfb028"
-
-DEPENDS += "mmngrbuf-user-module"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF_append = " \
-    --enable-cont-frame-capture \
-    --enable-ignore-fps-of-video-standard \
-"
-
-# submodule is extracted before do_populate_lic
-addtask do_init_submodule after do_unpack before do_patch
-
-do_init_submodule() {
-    export http_proxy=${http_proxy}
-    export https_proxy=${https_proxy}
-    export HTTP_PROXY=${HTTP_PROXY}
-    export HTTPS_PROXY=${HTTPS_PROXY}
-    cd ${S}
-    git submodule init
-    git submodule update
-}
-
-do_configure_prepend() {
-    cd ${S}
-    ./autogen.sh --noconfigure
-    cd ${B}
-}
diff --git a/recipes-qt/qt5/qtbase/oe-device-extra.pri b/recipes-qt/qt5/qtbase/oe-device-extra.pri
deleted file mode 100644
index c6f88ad..0000000
--- a/recipes-qt/qt5/qtbase/oe-device-extra.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-QMAKE_PLATFORM         += boot2qt
-
-QT_QPA_DEFAULT_PLATFORM = eglfs
-EGLFS_DEVICE_INTEGRATION = eglfs_kms
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt6/qtbase_git.bbappend
index ecba1f1..9961611 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt6/qtbase_git.bbappend
@@ -27,6 +27,4 @@
 ##
 ############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
 PACKAGECONFIG += "gbm kms"