[meta-qt5][PATCH 0/3] WIP: Qt5 SDK packagegroups and meta-toolchain

[meta-qt5][PATCH 0/3] WIP: Qt5 SDK packagegroups and meta-toolchain

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Otavio,

As we discussed, here are my copies of target and host packagegroups and
meta-toolchain recipes to finish up the Qt5 SDK. This is a modified version of
the recipes I've tested as part of the Arago distro some time ago. I'm in the
process of rebasing them on top of your branch, but here's a baseline against
the meta-qt5/master for now.

-- 
Denys

Denys Dmytriyenko (3):
  packagegroup-qt5-toolchain-target: add Qt5 SDK target packages
  nativesdk-packagegroup-qt5-toolchain-host: add Qt5 SDK host tools
  meta-toolchain-qt5: add Qt5 SDK standalone meta recipe

 recipes-core/meta/meta-toolchain-qt5.bb            | 55 ++++++++++++++++++++++
 .../nativesdk-packagegroup-qt5-toolchain-host.bb   | 10 ++++
 .../packagegroup-qt5-toolchain-target.bb           | 27 +++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 recipes-core/meta/meta-toolchain-qt5.bb
 create mode 100644 recipes-core/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
 create mode 100644 recipes-core/packagegroups/packagegroup-qt5-toolchain-target.bb

-- 
1.8.3.2

[meta-qt5][PATCH 1/3] packagegroup-qt5-toolchain-target: add Qt5 SDK target packages

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroup-qt5-toolchain-target.bb           | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 recipes-core/packagegroups/packagegroup-qt5-toolchain-target.bb

diff --git a/recipes-core/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-core/packagegroups/packagegroup-qt5-toolchain-target.bb
new file mode 100644
index 0000000..2f3dff6
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Target packages for Qt5 SDK"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+RDEPENDS_${PN} += " \
+        packagegroup-core-standalone-sdk-target \
+        libsqlite3-dev \
+        qtbase-mkspecs \
+        qtdeclarative-mkspecs \
+        qtscript-mkspecs \
+        qtwebkit-mkspecs \
+        qt3d-mkspecs \
+        qtlocation-mkspecs \
+        qtsensors-mkspecs \
+        qtsvg-mkspecs \
+        qtxmlpatterns-mkspecs \
+        qtbase-dev \
+        qtdeclarative-dev \
+        qtscript-dev \
+        qtwebkit-dev \
+        qt3d-dev \
+        qtlocation-dev \
+        qtsensors-dev \
+        qtsvg-dev \
+        qtxmlpatterns-dev \
+"
-- 
1.8.3.2

Re: [meta-qt5][PATCH 1/3] packagegroup-qt5-toolchain-target: add Qt5 SDK target packages

[Otavio Salvador]

On Mon, Feb 10, 2014 at 7:16 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

This includes some new package we were not installing. Those are:

+    libsqlite3-dev \
+    qtscript-mkspecs \
+    qtxmlpatterns-mkspecs \
+    qtsensors-mkspecs \
+    qt3d-mkspecs \
+    qtlocation-mkspecs \
+    qtsvg-mkspecs \
+    qtdeclarative-dev \
+    qtscript-dev \
+    qt3d-dev \
+    qtlocation-dev \
+    qtsensors-dev \

Do you want to do a commit on top of mine or should I just squash it
into my previous commit and put a note in the commit log thanking you
for the contribution?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH 1/3] packagegroup-qt5-toolchain-target: add Qt5 SDK target packages

[Denys Dmytriyenko]

On Tue, Feb 11, 2014 at 12:20:09PM -0200, Otavio Salvador wrote:
> On Mon, Feb 10, 2014 at 7:16 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> 
> This includes some new package we were not installing. Those are:
> 
> +    libsqlite3-dev \
> +    qtscript-mkspecs \
> +    qtxmlpatterns-mkspecs \
> +    qtsensors-mkspecs \
> +    qt3d-mkspecs \
> +    qtlocation-mkspecs \
> +    qtsvg-mkspecs \
> +    qtdeclarative-dev \
> +    qtscript-dev \
> +    qt3d-dev \
> +    qtlocation-dev \
> +    qtsensors-dev \
> 
> Do you want to do a commit on top of mine or should I just squash it
> into my previous commit and put a note in the commit log thanking you
> for the contribution?

Otavio,

As I mentioned in the cover letter, I was already rebaing this on top of your 
WIP branch and should have the patch ready with the above differences - you 
can apply it on top.

-- 
Denys

Re: [meta-qt5][PATCH 1/3] packagegroup-qt5-toolchain-target: add Qt5 SDK target packages

[Otavio Salvador]

On Tue, Feb 11, 2014 at 2:41 PM, Denys Dmytriyenko <denys@ti.com> wrote:
> On Tue, Feb 11, 2014 at 12:20:09PM -0200, Otavio Salvador wrote:
>> On Mon, Feb 10, 2014 at 7:16 PM, Denys Dmytriyenko <denis@denix.org> wrote:
>> > From: Denys Dmytriyenko <denys@ti.com>
>> >
>> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>
>> This includes some new package we were not installing. Those are:
>>
>> +    libsqlite3-dev \
>> +    qtscript-mkspecs \
>> +    qtxmlpatterns-mkspecs \
>> +    qtsensors-mkspecs \
>> +    qt3d-mkspecs \
>> +    qtlocation-mkspecs \
>> +    qtsvg-mkspecs \
>> +    qtdeclarative-dev \
>> +    qtscript-dev \
>> +    qt3d-dev \
>> +    qtlocation-dev \
>> +    qtsensors-dev \
>>
>> Do you want to do a commit on top of mine or should I just squash it
>> into my previous commit and put a note in the commit log thanking you
>> for the contribution?
>
> Otavio,
>
> As I mentioned in the cover letter, I was already rebaing this on top of your
> WIP branch and should have the patch ready with the above differences - you
> can apply it on top.

I wanted to fully test it against qtcreator and like. If you have the
patch I can apply it for sure.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[meta-qt5][PATCH 2/3] nativesdk-packagegroup-qt5-toolchain-host: add Qt5 SDK host tools

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 recipes-core/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb

diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-core/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
new file mode 100644
index 0000000..eb0af67
--- /dev/null
+++ b/recipes-core/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Host packages for Qt Embedded SDK"
+LICENSE = "MIT"
+
+inherit packagegroup nativesdk
+
+RDEPENDS_${PN} += " \
+        nativesdk-packagegroup-sdk-host \
+        nativesdk-qtbase-tools \
+        nativesdk-qttools \
+"
-- 
1.8.3.2

Re: [meta-qt5][PATCH 2/3] nativesdk-packagegroup-qt5-toolchain-host: add Qt5 SDK host tools

[Otavio Salvador]

On Mon, Feb 10, 2014 at 7:16 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

I checked this and the installed packages are the same we are
installing in our branch[1].

1. https://github.com/meta-qt5/meta-qt5/blob/ossystems/nativesdk/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb

I will discard this one.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[meta-qt5][PATCH 3/3] meta-toolchain-qt5: add Qt5 SDK standalone meta recipe

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-core/meta/meta-toolchain-qt5.bb | 55 +++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 recipes-core/meta/meta-toolchain-qt5.bb

diff --git a/recipes-core/meta/meta-toolchain-qt5.bb b/recipes-core/meta/meta-toolchain-qt5.bb
new file mode 100644
index 0000000..e4b70a4
--- /dev/null
+++ b/recipes-core/meta/meta-toolchain-qt5.bb
@@ -0,0 +1,55 @@
+SUMMARY = "Meta package for building an installable Qt5 toolchain and SDK"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK ?= "packagegroup-qt5-toolchain-target"
+
+inherit populate_sdk
+
+QT_DIR_NAME = "qt5"
+QT_BIN_PREFIX = "${QT_DIR_NAME}/"
+QT_MKSPECS_LOCATION = "${libdir}"
+
+toolchain_create_sdk_env_script_append() {
+	echo 'export PATH=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_DIR_NAME}:$PATH' >> $script
+	echo 'export OE_QMAKE_CFLAGS="${CFLAGS}"' >> $script
+	echo 'export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"' >> $script
+	echo 'export OE_QMAKE_LDFLAGS="${LDFLAGS}"' >> $script
+	echo 'export OE_QMAKE_CC=${CC}' >> $script
+	echo 'export OE_QMAKE_CXX=${CXX}' >> $script
+	echo 'export OE_QMAKE_LINK=${CXX}' >> $script
+	echo 'export OE_QMAKE_AR=${AR}' >> $script
+	echo 'export OE_QMAKE_LIBDIR_QT=$SDKTARGETSYSROOT${libdir}' >> $script
+	echo 'export OE_QMAKE_INCDIR_QT=$SDKTARGETSYSROOT${includedir}/${QT_DIR_NAME}' >> $script
+	echo 'export OE_QMAKE_HOST_BINDIR_QT=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}' >> $script
+	echo 'export OE_QMAKE_MOC=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}moc' >> $script
+	echo 'export OE_QMAKE_UIC=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}uic' >> $script
+	echo 'export OE_QMAKE_UIC3=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}uic3' >> $script
+	echo 'export OE_QMAKE_RCC=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}rcc' >> $script
+	echo 'export OE_QMAKE_QDBUSCPP2XML=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}qdbuscpp2xml' >> $script
+	echo 'export OE_QMAKE_QDBUSXML2CPP=$${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}qdbusxml2cpp' >> $script
+	echo 'export OE_QMAKE_QT_CONFIG=$SDKTARGETSYSROOT${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
+	echo 'export OE_QMAKE_STRIP="echo"' >> $script
+	echo 'export QMAKESPEC=$SDKTARGETSYSROOT${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mkspecs/linux-gnueabi-oe-g++' >> $script
+	echo 'export QMAKE_DEFAULT_LIBDIRS=${QT_QMAKE_LIBDIR_QT}' >> $script
+	echo 'export QMAKE_DEFAULT_INCDIRS=${QT_QMAKE_INCDIR_QT}' >> $script
+
+	#Adds qt.conf file that points qmake to properly locate Qt library and header files.
+	#This enables Qt Creator to work properly
+
+	qt_conf="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}qt.conf"
+	touch $qt_conf
+	echo '[Paths]' >> $qt_conf
+	echo 'Prefix = $(SDKTARGETSYSROOT)' >> $qt_conf
+	echo 'Libraries = $(OE_QMAKE_LIBDIR_QT)' >> $qt_conf
+	echo 'Headers = $(OE_QMAKE_INCDIR_QT)' >> $qt_conf
+	echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qt_conf
+	echo 'HostBinaries = $(OE_QMAKE_HOST_BINDIR_QT)' >> $qt_conf
+
+	# make a symbolic link to mkspecs for compatibility with Nokia's SDK
+	# and QTCreator
+	(cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; ln -sf .${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mkspecs mkspecs;)
+}
-- 
1.8.3.2