* [PATCH 2/4] arago.conf: Allow QT_PROVIDER to be overridden in branding files
2015-01-13 21:26 [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x Franklin S. Cooper Jr
@ 2015-01-13 21:26 ` Franklin S. Cooper Jr
2015-01-13 21:26 ` [PATCH 3/4] packagegroup-arago-tisdk-graphics: Exclude Weston in a Qt 4 based filesystem Franklin S. Cooper Jr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2015-01-13 21:26 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
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 12f29a5..387667b 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -23,7 +23,7 @@ DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbh
DISTRO_FEATURES += "pam"
# Set preferred Qt version
-QT_PROVIDER = "qt5"
+QT_PROVIDER ?= "qt5"
#QT5_VERSION = "5.4.0%"
# Distro-specific package configuration
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] packagegroup-arago-tisdk-graphics: Exclude Weston in a Qt 4 based filesystem
2015-01-13 21:26 [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x Franklin S. Cooper Jr
2015-01-13 21:26 ` [PATCH 2/4] arago.conf: Allow QT_PROVIDER to be overridden in branding files Franklin S. Cooper Jr
@ 2015-01-13 21:26 ` Franklin S. Cooper Jr
2015-01-13 21:26 ` [PATCH 4/4] packagegroup-arago-tisdk-qte-sdk-host: Add tstat when Qt 4 is being used Franklin S. Cooper Jr
2015-01-15 2:53 ` [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x Denys Dmytriyenko
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2015-01-13 21:26 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
.../packagegroup-arago-tisdk-graphics.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 9ec8cb7..f854596 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 = "r6"
+PR = "r7"
inherit packagegroup
@@ -48,7 +48,7 @@ GRAPHICS_BLTSVILLE_omap-a15 = " \
"
RDEPENDS_${PN} = "\
- ${GRAPHICS_WESTON} \
+ ${@base_conditional('QT_PROVIDER', 'qt4e', "", "${GRAPHICS_WESTON}", d)} \
${GRAPHICS_RDEPENDS} \
${GRAPHICS_BLTSVILLE} \
"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] packagegroup-arago-tisdk-qte-sdk-host: Add tstat when Qt 4 is being used.
2015-01-13 21:26 [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x Franklin S. Cooper Jr
2015-01-13 21:26 ` [PATCH 2/4] arago.conf: Allow QT_PROVIDER to be overridden in branding files Franklin S. Cooper Jr
2015-01-13 21:26 ` [PATCH 3/4] packagegroup-arago-tisdk-graphics: Exclude Weston in a Qt 4 based filesystem Franklin S. Cooper Jr
@ 2015-01-13 21:26 ` Franklin S. Cooper Jr
2015-01-15 2:53 ` [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x Denys Dmytriyenko
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2015-01-13 21:26 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
From: "Franklin S. Cooper Jr" <fcooper@ti.com>
* Thermostat application still need to be fixed for Qt 5 but until then include
for Qt 4 based filesystems.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
.../packagegroup-arago-tisdk-qte-sdk-host.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
index 1f541cc..b6ddb32 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to add Qt embedded related sources into the sdk"
LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
inherit packagegroup
@@ -8,6 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
QT4_DEMOS = "\
${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-src', '', d)} \
+ qt-tstat-src \
"
QT_DEMOS = "\
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x
2015-01-13 21:26 [PATCH 1/4] branding-amsdk: Clear AMSDK branding and include Qt 4 for AM335x and AM437x Franklin S. Cooper Jr
` (2 preceding siblings ...)
2015-01-13 21:26 ` [PATCH 4/4] packagegroup-arago-tisdk-qte-sdk-host: Add tstat when Qt 4 is being used Franklin S. Cooper Jr
@ 2015-01-15 2:53 ` Denys Dmytriyenko
3 siblings, 0 replies; 5+ messages in thread
From: Denys Dmytriyenko @ 2015-01-15 2:53 UTC (permalink / raw)
To: Franklin S. Cooper Jr; +Cc: meta-arago
All looks good.
On Tue, Jan 13, 2015 at 03:26:22PM -0600, Franklin S. Cooper Jr wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
>
> * Since SOC_FAMILY/MACHINE overrides have issues working in conf files use
> python based commands to only use Qt 5 on AM57x. All other devices (am335x and
> am437x) will use Qt 4.
>
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
> .../conf/distro/include/branding-amsdk.inc | 19 ++-----------------
> 1 file changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/meta-arago-distro/conf/distro/include/branding-amsdk.inc b/meta-arago-distro/conf/distro/include/branding-amsdk.inc
> index 11634a8..0d2a601 100644
> --- a/meta-arago-distro/conf/distro/include/branding-amsdk.inc
> +++ b/meta-arago-distro/conf/distro/include/branding-amsdk.inc
> @@ -1,18 +1,3 @@
> -# AM-SDK branding configuration
> +require branding-core.inc
> +QT_PROVIDER := "${@bb.utils.contains('SOC_FAMILY','omap-a15:dra7xx','qt5','qt4e',d)}"
>
> -# Use the SDK supported kernel and kernel version
> -PREFERRED_PROVIDER_virtual/kernel_am335x-evm = "linux-am335x-psp"
> -PREFERRED_VERSION_linux-am335x-psp = "3.2"
> -PREFERRED_VERSION_linux-libc-headers_am335x-evm = "3.2"
> -
> -PREFERRED_PROVIDER_ltp-ddt_am335x-evm = "ltp-ddt-legacy"
> -
> -PREFERRED_PROVIDER_virtual/bootloader_am335x-evm = "u-boot-ti-staging"
> -PREFERRED_PROVIDER_u-boot_am335x-evm = "u-boot-ti-staging"
> -
> -PREFERRED_PROVIDER_virtual/bootloader_am437x-evm = "u-boot-ti-staging"
> -PREFERRED_PROVIDER_u-boot_am437x-evm = "u-boot-ti-staging"
> -
> -# Use v4.09.00.01 of the Graphics SDK
> -PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
> -PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
> --
> 1.7.9.5
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 5+ messages in thread