Patchwork [meta-fsl-arm-extra] qtbase (5.2.0) Updated version name to match meta-qt5

login
register
mail settings
Submitter Sébastien Taylor
Date Feb. 8, 2014, 12:59 a.m.
Message ID <1391821154-1991-1-git-send-email-me@staylor.ca>
Download mbox | patch
Permalink /patch/66503/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Sébastien Taylor - Feb. 8, 2014, 12:59 a.m.
From: Sébastien Taylor <me@staylor.ca>

The meta-qt5 updated Qt version 5.1.1 to 5.2.0.  Contents remain
compatible.

Signed-off-by: Se?bastien Taylor <me@staylor.ca>
---
 qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend | 57 --------------------------
 qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend | 57 ++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend
Jacob Kroon - Feb. 8, 2014, 7:21 a.m.
Hi Sebastien,

Perhaps we should rename it to qtbase_%.bbappend, in order to
have it automatically applied for future Qt versions aswell ?

/Jacob

On Fri, 7 Feb 2014, Se?bastien Taylor wrote:

> From: Sébastien Taylor <me@staylor.ca>
>
> The meta-qt5 updated Qt version 5.1.1 to 5.2.0.  Contents remain
> compatible.
>
> Signed-off-by: Se?bastien Taylor <me@staylor.ca>
> ---
> qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend | 57 --------------------------
> qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend | 57 ++++++++++++++++++++++++++
> 2 files changed, 57 insertions(+), 57 deletions(-)
> delete mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
> create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend
>
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
> deleted file mode 100644
> index 310d7f7..0000000
> --- a/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
> -
> -HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
> -
> -PACKAGECONFIG_GL_mx5 = "gles2"
> -PACKAGECONFIG_append_mx5 = " tslib icu examples"
> -
> -PACKAGECONFIG_GL_mx6 = "gles2"
> -PACKAGECONFIG_append_mx6 = " tslib icu examples"
> -
> -do_configure_prepend_mx5() {
> -    sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> -
> -    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> -IMX5_CFLAGS             = -D_LINUX=1
> -QMAKE_LIBS_EGL         += -lEGL
> -QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
> -QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
> -
> -QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
> -QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
> -QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
> -QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
> -
> -load(qt_config)
> -
> -EOF
> -}
> -
> -do_configure_prepend_mx6() {
> -	# adapt qmake.conf to our needs
> -	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> -    if test ${HAS_X11} -eq 0; then
> -		cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> -EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
> -IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
> -EOF
> -		# copy the hook in the mkspecs directory OE is using
> -		cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
> -	else
> -	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> -IMX6_CFLAGS             = -DLINUX=1
> -EOF
> -	fi
> -	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> -QMAKE_LIBS_EGL         += -lEGL
> -QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
> -QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
> -QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
> -QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
> -QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
> -QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
> -
> -load(qt_config)
> -
> -EOF
> -}
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend
> new file mode 100644
> index 0000000..310d7f7
> --- /dev/null
> +++ b/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend
> @@ -0,0 +1,57 @@
> +# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
> +
> +HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
> +
> +PACKAGECONFIG_GL_mx5 = "gles2"
> +PACKAGECONFIG_append_mx5 = " tslib icu examples"
> +
> +PACKAGECONFIG_GL_mx6 = "gles2"
> +PACKAGECONFIG_append_mx6 = " tslib icu examples"
> +
> +do_configure_prepend_mx5() {
> +    sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> +
> +    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +IMX5_CFLAGS             = -D_LINUX=1
> +QMAKE_LIBS_EGL         += -lEGL
> +QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
> +QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
> +
> +QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
> +QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
> +QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
> +QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
> +
> +load(qt_config)
> +
> +EOF
> +}
> +
> +do_configure_prepend_mx6() {
> +	# adapt qmake.conf to our needs
> +	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> +    if test ${HAS_X11} -eq 0; then
> +		cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
> +IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
> +EOF
> +		# copy the hook in the mkspecs directory OE is using
> +		cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
> +	else
> +	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +IMX6_CFLAGS             = -DLINUX=1
> +EOF
> +	fi
> +	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
> +QMAKE_LIBS_EGL         += -lEGL
> +QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
> +QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
> +QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
> +QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
> +QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
> +QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
> +
> +load(qt_config)
> +
> +EOF
> +}
> -- 
> 1.8.3.4 (Apple Git-47)
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
Otavio Salvador - Feb. 8, 2014, 7:20 p.m.
Hello Sebastien,

On Sat, Feb 8, 2014 at 5:21 AM, Jacob Kroon <jacob.kroon@gmail.com> wrote:
> Perhaps we should rename it to qtbase_%.bbappend, in order to
> have it automatically applied for future Qt versions aswell ?

Yes; is the best alternative in master :-)
Sébastien Taylor - Feb. 9, 2014, 4 a.m.
I’m not familiar with that method but sounds like a much better way than having to chase versions.  Does the file actually use % in it’s filename then?

On Feb 8, 2014, at 12:20 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:

> Hello Sebastien,
> 
> On Sat, Feb 8, 2014 at 5:21 AM, Jacob Kroon <jacob.kroon@gmail.com> wrote:
>> Perhaps we should rename it to qtbase_%.bbappend, in order to
>> have it automatically applied for future Qt versions aswell ?
> 
> Yes; is the best alternative in master :-)
> 
> -- 
> 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
Jacob Kroon - Feb. 9, 2014, 6:48 a.m.
Yes.

There are some usage examples in meta-openembedded at least:

[jkroon@localhost meta-openembedded]$ find|grep %
./meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
./meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_%.bbappend
./meta-systemd/oe-core/recipes-connectivity/connman/connman_%.bbappend
./meta-systemd/oe-core/recipes-connectivity/ofono/ofono_%.bbappend
./meta-systemd/oe-core/recipes-core/dropbear/dropbear_%.bbappend
./meta-systemd/oe-core/recipes-core/dbus/dbus_%.bbappend
./meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend



On Sun, Feb 9, 2014 at 5:00 AM, Sébastien Taylor <me@staylor.ca> wrote:

> I'm not familiar with that method but sounds like a much better way than
> having to chase versions.  Does the file actually use % in it's filename
> then?
>
> On Feb 8, 2014, at 12:20 PM, Otavio Salvador <otavio@ossystems.com.br>
> wrote:
>
> > Hello Sebastien,
> >
> > On Sat, Feb 8, 2014 at 5:21 AM, Jacob Kroon <jacob.kroon@gmail.com>
> wrote:
> >> Perhaps we should rename it to qtbase_%.bbappend, in order to
> >> have it automatically applied for future Qt versions aswell ?
> >
> > Yes; is the best alternative in master :-)
> >
> > --
> > 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
>
>
Otavio Salvador - Feb. 10, 2014, 10:49 a.m.
On Fri, Feb 7, 2014 at 10:59 PM, Se?bastien Taylor <me@staylor.ca> wrote:
> From: Sébastien Taylor <me@staylor.ca>
>
> The meta-qt5 updated Qt version 5.1.1 to 5.2.0.  Contents remain
> compatible.
>
> Signed-off-by: Se?bastien Taylor <me@staylor.ca>

I applied this patch but did the change we discussed here. So the
final commit log is:

Author: Sébastien Taylor <me@staylor.ca>
Date:   Fri Feb 7 17:59:14 2014 -0700

    qtbase: change .bbappend to use %

    The meta-qt5 updated Qt version 5.1.1 to 5.2.0, change file name to
    use % and append against any revision of the main qtbase recipe.  This
    makes updating the .bbappend file name only necessary if recipe itself
    needs to change.

    Change-Id: I16852d67c8becdf55a851ea3b52c411ffa805c28
    Signed-off-by: Se?bastien Taylor <me@staylor.ca>

Thanks for sending the patch.

Patch

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
deleted file mode 100644
index 310d7f7..0000000
--- a/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
+++ /dev/null
@@ -1,57 +0,0 @@ 
-# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
-
-HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
-
-PACKAGECONFIG_GL_mx5 = "gles2"
-PACKAGECONFIG_append_mx5 = " tslib icu examples"
-
-PACKAGECONFIG_GL_mx6 = "gles2"
-PACKAGECONFIG_append_mx6 = " tslib icu examples"
-
-do_configure_prepend_mx5() {
-    sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
-
-    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX5_CFLAGS             = -D_LINUX=1
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
-
-QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
-QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
-QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
-QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
-
-load(qt_config)
-
-EOF
-}
-
-do_configure_prepend_mx6() {
-	# adapt qmake.conf to our needs
-	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
-    if test ${HAS_X11} -eq 0; then
-		cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
-IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
-EOF
-		# copy the hook in the mkspecs directory OE is using
-		cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
-	else
-	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX6_CFLAGS             = -DLINUX=1
-EOF
-	fi
-	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
-QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
-QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
-QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
-QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
-
-load(qt_config)
-
-EOF
-}
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend
new file mode 100644
index 0000000..310d7f7
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend
@@ -0,0 +1,57 @@ 
+# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
+
+HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
+
+PACKAGECONFIG_GL_mx5 = "gles2"
+PACKAGECONFIG_append_mx5 = " tslib icu examples"
+
+PACKAGECONFIG_GL_mx6 = "gles2"
+PACKAGECONFIG_append_mx6 = " tslib icu examples"
+
+do_configure_prepend_mx5() {
+    sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+
+    cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+IMX5_CFLAGS             = -D_LINUX=1
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_CFLAGS_RELEASE   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX5_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS
+
+load(qt_config)
+
+EOF
+}
+
+do_configure_prepend_mx6() {
+	# adapt qmake.conf to our needs
+	sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
+    if test ${HAS_X11} -eq 0; then
+		cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
+IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
+EOF
+		# copy the hook in the mkspecs directory OE is using
+		cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
+	else
+	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+IMX6_CFLAGS             = -DLINUX=1
+EOF
+	fi
+	cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
+QMAKE_CFLAGS_RELEASE   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS
+QMAKE_CFLAGS_DEBUG   += \$\$IMX6_CFLAGS
+QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS
+
+load(qt_config)
+
+EOF
+}