[PATCH v2 0/4] Implment the wayland DISTRO_FEATURE.

[PATCH v2 0/4] Implment the wayland DISTRO_FEATURE.

[Jacob Stiffler]

* Only include wayland, weston, and example packages if 'wayland' is a
  DISTRO_FEATURE.
* By default, if 'screen' is a MACHINE_FEATURE, then add 'wayland' as a
  DISTRO_FEATURE.
* Configure qt5 to use wayland if it is a DISTRO_FEATURE, otherwise use eglfs.
* Add processor-sdk brand to remove wayland from DISTRO_EFATURES for the ti33x
  and ti43x soc families.


Jacob Stiffler (4):
  arago.conf: Include wayland in DISTRO_FEATURES by default.
  packagegroup-*: Include wayland/weston if specified in
    DISTRO_FEATURES.
  qtbase: Use DISTRO_FEATURES to set appropriate qpa.
  branding-processor-sdk: Add processor-sdk brand.

 meta-arago-distro/conf/distro/arago.conf           |    2 +-
 .../conf/distro/include/branding-processor-sdk.inc |   35 ++++++++++++++++++++
 .../packagegroups/packagegroup-arago-qte.bb        |    4 +--
 .../packagegroup-arago-tisdk-graphics.bb           |    4 +--
 .../packagegroups/packagegroup-arago-tisdk-qte.bb  |    4 +--
 .../packagegroups/packagegroup-linaro-tc-test.bb   |    5 +--
 meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh  |    1 -
 .../recipes-qt/qt5/qtbase_5.4.1.bbappend           |    4 +--
 8 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 meta-arago-distro/conf/distro/include/branding-processor-sdk.inc

-- 
v2: Change order of patches.

1.7.9.5

[PATCH v2 1/4] arago.conf: Include wayland in DISTRO_FEATURES by default.

[Jacob Stiffler]

* This is done conditional depending if 'screen' is a MACHINE_FEATURE.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
v2: Submit as first in set.

 meta-arago-distro/conf/distro/arago.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 338d41b..1c14e6f 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -22,7 +22,7 @@ NO32LIBS = "0"
 DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g ipv4 ipv6 pulseaudio ${DISTRO_FEATURES_LIBC}"
 
 # Set additional distro features
-DISTRO_FEATURES += "pam"
+DISTRO_FEATURES += "pam ${@base_contains('MACHINE_FEATURES', 'screen', 'wayland', '', d)}"
 
 # Set preferred Qt version
 QT_PROVIDER ?= "qt5"
-- 
1.7.9.5

[PATCH v2 2/4] packagegroup-*: Include wayland/weston if specified in DISTRO_FEATURES.

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../packagegroups/packagegroup-arago-qte.bb        |    4 ++--
 .../packagegroup-arago-tisdk-graphics.bb           |    4 ++--
 .../packagegroups/packagegroup-arago-tisdk-qte.bb  |    4 ++--
 .../packagegroups/packagegroup-linaro-tc-test.bb   |    5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index 9618de5..149dfac 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add Qt embedded related packages"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 inherit packagegroup
 
@@ -34,7 +34,7 @@ QT5_ESSENTIALS = "\
     qtlocation-qmlplugins \
     qtmultimedia-plugins \
     qtmultimedia-qmlplugins \
-    qtwayland-plugins \
+    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins', '', d)} \
     qt3d-qmlplugins \
     qtwebkit-qmlplugins \
     qtquick1-plugins \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index 74b8417..327a11b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install graphics binaries"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 inherit packagegroup
 
@@ -43,6 +43,6 @@ GRAPHICS_RDEPENDS_omap-a15 = "\
 #    omapdrm-pvr
 
 RDEPENDS_${PN} = "\
-    ${@base_conditional('QT_PROVIDER', 'qt4e', "", "${GRAPHICS_WESTON}", d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wayland', "${GRAPHICS_WESTON}", '', d)} \
     ${GRAPHICS_RDEPENDS} \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index eeb32fb..ac84008 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add Qt embedded related packages"
 LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
 
 inherit packagegroup
 
@@ -22,7 +22,7 @@ QT5_DEMOS = "\
     qtlocation-examples \
     qtmultimedia-examples \
     qtscript-examples \
-    qtwayland-examples \
+    ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
     qtwebkit-examples-examples \
     qtquick1-examples \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
index 8fd863e..68e7ab0 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Group of packages to build with Linaro toolchain for testing"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 RDEPENDS_${PN} = "\
@@ -10,8 +12,7 @@ RDEPENDS_${PN} = "\
     bash \
     coreutils \
     apache \
-    wayland \
-    weston \
+    ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland weston', '', d)} \
     gstreamer \
     openssl \
     openssh \
-- 
1.7.9.5

[PATCH v2 3/4] qtbase: Use DISTRO_FEATURES to set appropriate qpa.

[Jacob Stiffler]

* If wayland is in DISTRO_FEATURES, then configure '-qpa wayland'
* Otherwise configure '-qpa eglfs'

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
v2: omap-a15 requires wayland regardless of whether it is a feature.

 meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh  |    1 -
 .../recipes-qt/qt5/qtbase_5.4.1.bbappend           |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
index 1e8c196..f888d50 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh
@@ -2,4 +2,3 @@
 
 ### QT Environment Variables ###
 export QT_QPA_GENERIC_PLUGINS=Auto
-export QT_QPA_PLATFORM=wayland
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
index a466581..4af0582 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
@@ -5,9 +5,9 @@ GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
 
 PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
 
-PR_append = "-arago3"
+PR_append = "-arago4"
 
-QT_CONFIG_FLAGS += "-qpa wayland"
+QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
 
 SRC_URI += "file://qt_env.sh"
 
-- 
1.7.9.5

[PATCH v2 4/4] branding-processor-sdk: Add processor-sdk brand.

[Jacob Stiffler]

* Set ARAGO_TISDK_IMAGE to "processor-sdk-linux-image"
* For now, use sitara-linux-ti-staging
* and remove wayland feature for ti33x and ti43x soc families.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
v2: Use DISTRO_FEATURES_remove_<machine> instead of oe_filter_out.

 .../conf/distro/include/branding-processor-sdk.inc |   35 ++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 meta-arago-distro/conf/distro/include/branding-processor-sdk.inc

diff --git a/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
new file mode 100644
index 0000000..d277aac
--- /dev/null
+++ b/meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
@@ -0,0 +1,35 @@
+ARAGO_TISDK_IMAGE = "processor-sdk-linux-image"
+
+# Remove wayland from ti33x and ti43x DISTRO_FEATURES.
+DISTRO_FEATURES_remove_ti33x = "wayland"
+DISTRO_FEATURES_remove_ti43x = "wayland"
+
+PREFERRED_PROVIDER_virtual/kernel_am335x-evm = "sitara-linux-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel_am437x-evm = "sitara-linux-ti-staging"
+PREFERRED_VERSION_sitara-linux-ti-staging = "3.14%"
+
+# To create newlines in the message \n is used and the slash must be escaped
+# to function properly
+
+SRCIPK_GIT_COMMIT_MESSAGE = "\
+Create local branch\\n\
+\\n\
+The below commit is used for this local branch and is the one used by\\n\
+this sdk:\\n\
+${SRCREV}."
+
+SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE ="${SRCIPK_GIT_COMMIT_MESSAGE}\\n\\n\
+To reduce the size of the SDK installer only a portion of the git commit\\n\
+history has been preserved. Also links to remote branches and tags do\\n\
+not exist in this copy of the repository.\\n\
+To fix this please run the unshallow-repositories.sh\\n\
+script located in the sdk\'s bin directory\\n\
+\\n\
+The script may take several minutes but you will then have a full copy of\\n\
+the git repository including its entire git history.\\n"
+
+SRCIPK_CUSTOM_GIT_BRANCH_pn-sitara-linux-ti-staging = "processor-sdk-1.0"
+SRCIPK_CUSTOM_GIT_MESSAGE_pn-sitara-linux-ti-staging = "${SRCIPK_SHALLOW_GIT_COMMIT_MESSAGE}"
+
+SRCIPK_CUSTOM_GIT_BRANCH_pn-u-boot-ti-staging = "processor-sdk-1.0"
+SRCIPK_CUSTOM_GIT_MESSAGE_pn-u-boot-ti-staging = "${SRCIPK_GIT_COMMIT_MESSAGE}"
-- 
1.7.9.5

Re: [PATCH v2 0/4] Implment the wayland DISTRO_FEATURE.

[Denys Dmytriyenko]

Looks good, thanks.

On Thu, Mar 12, 2015 at 03:46:18PM -0400, Jacob Stiffler wrote:
> * Only include wayland, weston, and example packages if 'wayland' is a
>   DISTRO_FEATURE.
> * By default, if 'screen' is a MACHINE_FEATURE, then add 'wayland' as a
>   DISTRO_FEATURE.
> * Configure qt5 to use wayland if it is a DISTRO_FEATURE, otherwise use eglfs.
> * Add processor-sdk brand to remove wayland from DISTRO_EFATURES for the ti33x
>   and ti43x soc families.
> 
> 
> Jacob Stiffler (4):
>   arago.conf: Include wayland in DISTRO_FEATURES by default.
>   packagegroup-*: Include wayland/weston if specified in
>     DISTRO_FEATURES.
>   qtbase: Use DISTRO_FEATURES to set appropriate qpa.
>   branding-processor-sdk: Add processor-sdk brand.
> 
>  meta-arago-distro/conf/distro/arago.conf           |    2 +-
>  .../conf/distro/include/branding-processor-sdk.inc |   35 ++++++++++++++++++++
>  .../packagegroups/packagegroup-arago-qte.bb        |    4 +--
>  .../packagegroup-arago-tisdk-graphics.bb           |    4 +--
>  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |    4 +--
>  .../packagegroups/packagegroup-linaro-tc-test.bb   |    5 +--
>  meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh  |    1 -
>  .../recipes-qt/qt5/qtbase_5.4.1.bbappend           |    4 +--
>  8 files changed, 47 insertions(+), 12 deletions(-)
>  create mode 100644 meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
> 
> -- 
> v2: Change order of patches.
> 
> 1.7.9.5
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH v2 0/4] Implment the wayland DISTRO_FEATURE.

[Cooper Jr., Franklin]

The patch set looks great.

The only issue I see is what happens when a user wants to use Qt 4. I don't think Qt 4 and wayland works together so we should have a check to not include Wayland if Qt 4 is being used. Thoughts?

> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> Sent: Thursday, March 12, 2015 2:54 PM
> To: Stiffler, Jacob
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH v2 0/4] Implment the wayland
> DISTRO_FEATURE.
> 
> Looks good, thanks.
> 
> On Thu, Mar 12, 2015 at 03:46:18PM -0400, Jacob Stiffler wrote:
> > * Only include wayland, weston, and example packages if 'wayland' is a
> >   DISTRO_FEATURE.
> > * By default, if 'screen' is a MACHINE_FEATURE, then add 'wayland' as a
> >   DISTRO_FEATURE.
> > * Configure qt5 to use wayland if it is a DISTRO_FEATURE, otherwise use
> eglfs.
> > * Add processor-sdk brand to remove wayland from DISTRO_EFATURES for
> the ti33x
> >   and ti43x soc families.
> >
> >
> > Jacob Stiffler (4):
> >   arago.conf: Include wayland in DISTRO_FEATURES by default.
> >   packagegroup-*: Include wayland/weston if specified in
> >     DISTRO_FEATURES.
> >   qtbase: Use DISTRO_FEATURES to set appropriate qpa.
> >   branding-processor-sdk: Add processor-sdk brand.
> >
> >  meta-arago-distro/conf/distro/arago.conf           |    2 +-
> >  .../conf/distro/include/branding-processor-sdk.inc |   35
> ++++++++++++++++++++
> >  .../packagegroups/packagegroup-arago-qte.bb        |    4 +--
> >  .../packagegroup-arago-tisdk-graphics.bb           |    4 +--
> >  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |    4 +--
> >  .../packagegroups/packagegroup-linaro-tc-test.bb   |    5 +--
> >  meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh  |    1 -
> >  .../recipes-qt/qt5/qtbase_5.4.1.bbappend           |    4 +--
> >  8 files changed, 47 insertions(+), 12 deletions(-)  create mode
> > 100644
> > meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
> >
> > --
> > v2: Change order of patches.
> >
> > 1.7.9.5
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH v2 0/4] Implment the wayland DISTRO_FEATURE.

[Denys Dmytriyenko]

On Thu, Mar 12, 2015 at 04:20:02PM -0400, Cooper Jr., Franklin wrote:
> The patch set looks great.
> 
> The only issue I see is what happens when a user wants to use Qt 4. I don't 
> think Qt 4 and wayland works together so we should have a check to not 
> include Wayland if Qt 4 is being used. Thoughts?

Yeah, we may need an additional check, but it won't block this set.


> > -----Original Message-----
> > From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> > bounces@arago-project.org] On Behalf Of Dmytriyenko, Denys
> > Sent: Thursday, March 12, 2015 2:54 PM
> > To: Stiffler, Jacob
> > Cc: meta-arago@arago-project.org
> > Subject: Re: [meta-arago] [PATCH v2 0/4] Implment the wayland
> > DISTRO_FEATURE.
> > 
> > Looks good, thanks.
> > 
> > On Thu, Mar 12, 2015 at 03:46:18PM -0400, Jacob Stiffler wrote:
> > > * Only include wayland, weston, and example packages if 'wayland' is a
> > >   DISTRO_FEATURE.
> > > * By default, if 'screen' is a MACHINE_FEATURE, then add 'wayland' as a
> > >   DISTRO_FEATURE.
> > > * Configure qt5 to use wayland if it is a DISTRO_FEATURE, otherwise use
> > eglfs.
> > > * Add processor-sdk brand to remove wayland from DISTRO_EFATURES for
> > the ti33x
> > >   and ti43x soc families.
> > >
> > >
> > > Jacob Stiffler (4):
> > >   arago.conf: Include wayland in DISTRO_FEATURES by default.
> > >   packagegroup-*: Include wayland/weston if specified in
> > >     DISTRO_FEATURES.
> > >   qtbase: Use DISTRO_FEATURES to set appropriate qpa.
> > >   branding-processor-sdk: Add processor-sdk brand.
> > >
> > >  meta-arago-distro/conf/distro/arago.conf           |    2 +-
> > >  .../conf/distro/include/branding-processor-sdk.inc |   35
> > ++++++++++++++++++++
> > >  .../packagegroups/packagegroup-arago-qte.bb        |    4 +--
> > >  .../packagegroup-arago-tisdk-graphics.bb           |    4 +--
> > >  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |    4 +--
> > >  .../packagegroups/packagegroup-linaro-tc-test.bb   |    5 +--
> > >  meta-arago-distro/recipes-qt/qt5/qtbase/qt_env.sh  |    1 -
> > >  .../recipes-qt/qt5/qtbase_5.4.1.bbappend           |    4 +--
> > >  8 files changed, 47 insertions(+), 12 deletions(-)  create mode
> > > 100644
> > > meta-arago-distro/conf/distro/include/branding-processor-sdk.inc
> > >
> > > --
> > > v2: Change order of patches.
> > >
> > > 1.7.9.5
> > >
> > > _______________________________________________
> > > meta-arago mailing list
> > > meta-arago@arago-project.org
> > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago