* [PATCH 1/5] base-files: update fstab with recent fstype changes, mount /run
@ 2014-08-03 1:10 Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 2/5] arago-image.inc: add udev-extraconf unconditionally to all images Denys Dmytriyenko
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2014-08-03 1:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Need to mount /run early on now (which replaced /var/run) and due to the
order of udev startup, otherwise it won't be able to create control socket
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/recipes-core/base-files/base-files/fstab | 6 +++---
.../recipes-core/base-files/base-files_3.0.14.bbappend | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-arago-distro/recipes-core/base-files/base-files/fstab b/meta-arago-distro/recipes-core/base-files/base-files/fstab
index 388de68..9ed6f33 100644
--- a/meta-arago-distro/recipes-core/base-files/base-files/fstab
+++ b/meta-arago-distro/recipes-core/base-files/base-files/fstab
@@ -1,11 +1,11 @@
# stock fstab - you probably want to override this with a machine specific one
-rootfs / auto defaults 1 1
+/dev/root / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
-usbfs /proc/bus/usb usbfs defaults 0 0
+usbdevfs /proc/bus/usb usbdevfs noauto 0 0
+tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
tmpfs /var/volatile tmpfs defaults,size=16M 0 0
-tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /media/ram tmpfs defaults,size=16M 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
diff --git a/meta-arago-distro/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-arago-distro/recipes-core/base-files/base-files_3.0.14.bbappend
index 8c65bd1..40b7722 100644
--- a/meta-arago-distro/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-arago-distro/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,4 @@
# look for files in this layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = "-arago2"
+PR_append = "-arago3"
--
2.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] arago-image.inc: add udev-extraconf unconditionally to all images
2014-08-03 1:10 [PATCH 1/5] base-files: update fstab with recent fstype changes, mount /run Denys Dmytriyenko
@ 2014-08-03 1:10 ` Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 3/5] recipes: replace base_contains with base_conditional when not used on lists Denys Dmytriyenko
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2014-08-03 1:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Previously, udev used to RRECOMMENDS udev-extraconf in past releases. Now it
needs to be added explicitly.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/recipes-core/images/arago-image.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index 7cab56a..98af6c3 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -18,6 +18,7 @@ ARAGO_IMAGE_EXTRA_INSTALL ?= ""
IMAGE_INSTALL += " \
packagegroup-core-boot \
bash \
+ udev-extraconf \
${ARAGO_IMAGE_EXTRA_INSTALL} \
"
--
2.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] recipes: replace base_contains with base_conditional when not used on lists
2014-08-03 1:10 [PATCH 1/5] base-files: update fstab with recent fstype changes, mount /run Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 2/5] arago-image.inc: add udev-extraconf unconditionally to all images Denys Dmytriyenko
@ 2014-08-03 1:10 ` Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 4/5] packagegroups, images: combine qt4e and qt5 recipes to avoid confusion Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 5/5] arago.conf: drop removal of "sgx" feature, update version Denys Dmytriyenko
3 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2014-08-03 1:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Speed up parsing time a bit by using faster direct comparison instead of
searching for a substring.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 +-
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 2 +-
.../packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb | 4 ++--
.../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index eada6a8..1178687 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -25,7 +25,7 @@ PREFERRED_VERSION_libdrm = "2.4.52"
PREFERRED_PROVIDER_virtual/gettext = "gettext"
-ARAGO_QT_PROVIDER = "${@base_contains('QT_PROVIDER','qt5','',base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d),d)}"
+ARAGO_QT_PROVIDER = "${@base_conditional('QT_PROVIDER','qt5','',base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d),d)}"
PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}"
PREFERRED_VERSION_qt4-embedded = "4.8.5"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 0d7810a..649dfe3 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb
IMAGE_INSTALL += "\
packagegroup-arago-test \
${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
- ${@base_contains('QT_PROVIDER','qt5','packagegroup-arago-tisdk-qt5','packagegroup-arago-tisdk-qte',d)} \
+ ${@base_conditional('QT_PROVIDER','qt5','packagegroup-arago-tisdk-qt5','packagegroup-arago-tisdk-qte',d)} \
packagegroup-arago-tisdk-addons \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
index e5d1be5..5f021d3 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
@@ -20,8 +20,8 @@ TOOLS_append_am3517-evm = " flash-utility"
EXTRA_FILES = ""
EXTRA_FILES_omap-a15 = "tisdk-readme tisdk-uenv"
-EXTRA_FILES_ti33x = "${@base_contains('ARAGO_BRAND','amsdk','','tisdk-readme',d)}"
-EXTRA_FILES_ti43x = "${@base_contains('ARAGO_BRAND','amsdk','','tisdk-readme',d)}"
+EXTRA_FILES_ti33x = "${@base_conditional('ARAGO_BRAND','amsdk','','tisdk-readme',d)}"
+EXTRA_FILES_ti43x = "${@base_conditional('ARAGO_BRAND','amsdk','','tisdk-readme',d)}"
RDEPENDS_${PN} = "\
${TOOLS} \
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 749fb72..336f5cb 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -95,7 +95,7 @@ MAKEFILES_append_am180x-evm = " pru \
PLATFORM_ARCH = "armv7-a"
PLATFORM_ARCH_omapl138 = "armv5te"
-KERNEL_BUILD_CMDS = "${@base_contains('KERNEL_IMAGETYPE','uImage','LOADADDR=${UBOOT_LOADADDRESS} uImage','zImage',d)}"
+KERNEL_BUILD_CMDS = "${@base_conditional('KERNEL_IMAGETYPE','uImage','LOADADDR=${UBOOT_LOADADDRESS} uImage','zImage',d)}"
KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am437x-gp-evm.dtb"
--
2.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] packagegroups, images: combine qt4e and qt5 recipes to avoid confusion
2014-08-03 1:10 [PATCH 1/5] base-files: update fstab with recent fstype changes, mount /run Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 2/5] arago-image.inc: add udev-extraconf unconditionally to all images Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 3/5] recipes: replace base_contains with base_conditional when not used on lists Denys Dmytriyenko
@ 2014-08-03 1:10 ` Denys Dmytriyenko
2014-08-04 13:48 ` Maupin, Chase
2014-08-03 1:10 ` [PATCH 5/5] arago.conf: drop removal of "sgx" feature, update version Denys Dmytriyenko
3 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2014-08-03 1:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
It was started as a fix to prevent qt4-embedded from being pulled into the
build when building qt5 and would have required creating empty qt5-specific
packagegroup-arago-tisdk-qt5-sdk-host recipe. Unification was in order.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-core/images/arago-qt5-test-image.bb | 19 -----------
.../recipes-core/images/tisdk-rootfs-image.bb | 2 +-
.../packagegroups/packagegroup-arago-qt5.bb | 15 ---------
.../packagegroups/packagegroup-arago-qte.bb | 20 ++++++++---
.../packagegroups/packagegroup-arago-tisdk-qt5.bb | 18 ----------
.../packagegroup-arago-tisdk-qte-sdk-host.bb | 8 +++--
.../packagegroups/packagegroup-arago-tisdk-qte.bb | 15 +++++++--
.../packagegroups/packagegroup-linaro-tc-test.bb | 24 +++++++++++++
.../packagegroup-arago-qt5-toolchain-target.bb | 33 ------------------
.../packagegroup-arago-qte-toolchain-target.bb | 39 ++++++++++++++++++----
10 files changed, 92 insertions(+), 101 deletions(-)
delete mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb
delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
delete mode 100644 meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb
deleted file mode 100644
index 5fbbfd3..0000000
--- a/meta-arago-distro/recipes-core/images/arago-qt5-test-image.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Arago Qt5 test image
-# gives you an image with Qt5 for basic testing purposes.
-
-require arago-image.inc
-inherit remove-net-rules
-
-IMAGE_INSTALL += "\
- packagegroup-arago-base \
- packagegroup-arago-console \
- packagegroup-arago-base-tisdk \
- qtbase-plugins \
- qt-tstat \
- "
-
-# These are now disabled due to gles dependency
-# matrix-gui-browser
-# qtwebkit-examples-examples
-
-export IMAGE_BASENAME = "arago-qt5-test-image"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 649dfe3..1bc6a36 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb
IMAGE_INSTALL += "\
packagegroup-arago-test \
${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
- ${@base_conditional('QT_PROVIDER','qt5','packagegroup-arago-tisdk-qt5','packagegroup-arago-tisdk-qte',d)} \
+ packagegroup-arago-tisdk-qte \
packagegroup-arago-tisdk-addons \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
deleted file mode 100644
index ff0f3ed..0000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Task to add Qt embedded related packages"
-LICENSE = "MIT"
-PR = "r0"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS_${PN} = "\
- qtbase-plugins \
- qtdeclarative-plugins \
- qtlocation-plugins \
- qtmultimedia-plugins \
- qtwayland-plugins \
-"
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 0ce08db..b2dd546 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -1,18 +1,18 @@
DESCRIPTION = "Task to add Qt embedded related packages"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-QT_SGX_SUPPORT = "\
+QT4_SGX_SUPPORT = "\
qt4-embedded-plugin-gfxdriver-gfxpvregl \
libqt-embeddedopengl4 \
libqt-embeddedpvrqwswsegl4 \
"
-RDEPENDS_${PN} = "\
+QT4_ESSENTIALS = "\
qt4-embedded \
qt4-embedded-plugin-mousedriver-tslib \
qt4-embedded-plugin-gfxdriver-gfxtransformed \
@@ -23,5 +23,17 @@ RDEPENDS_${PN} = "\
libqt-embeddedmultimedia4 \
libqt-embeddeddeclarative4 \
libqt-embeddedxmlpatterns4 \
- ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', '${QT_SGX_SUPPORT}', '', d)} \
+ ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', '${QT4_SGX_SUPPORT}', '', d)} \
+"
+
+QT5_ESSENTIALS = "\
+ qtbase-plugins \
+ qtdeclarative-plugins \
+ qtlocation-plugins \
+ qtmultimedia-plugins \
+ qtwayland-plugins \
+"
+
+RDEPENDS_${PN} = "\
+ ${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
deleted file mode 100644
index 9ce43e6..0000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Task to add Qt embedded related packages"
-LICENSE = "MIT"
-PR = "r0"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-QT_DEMOS = "\
- qtwayland-examples \
- qtwebkit-examples-examples \
- qt-tstat \
-"
-
-RDEPENDS_${PN} = "\
- packagegroup-arago-qt5 \
- ${QT_DEMOS} \
-"
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 4cb85fe..3615cd4 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,16 +1,20 @@
DESCRIPTION = "Task to add Qt embedded related sources into the sdk"
LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
+QT4_DEMOS = "\
+ ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-src', '', d)} \
+"
+
QT_DEMOS = "\
qt-tstat-src \
- ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-src', '', d)} \
"
RDEPENDS_${PN} = "\
+ ${@base_conditional('QT_PROVIDER', 'qt5', '', "${QT4_DEMOS}", d)} \
${QT_DEMOS} \
"
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 10187a6..e745a08 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,19 +1,28 @@
DESCRIPTION = "Task to add Qt embedded related packages"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-QT_DEMOS = "\
+QT4_DEMOS = "\
qt4-embedded-examples \
qt4-embedded-demos \
- qt-tstat \
${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \
"
+QT5_DEMOS = "\
+ qtwayland-examples \
+ qtwebkit-examples-examples \
+"
+
+QT_DEMOS = "\
+ qt-tstat \
+"
+
RDEPENDS_${PN} = "\
packagegroup-arago-qte \
+ ${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DEMOS}", "${QT4_DEMOS}", d)} \
${QT_DEMOS} \
"
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
new file mode 100644
index 0000000..8fd863e
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Group of packages to build with Linaro toolchain for testing"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = "\
+ virtual/kernel \
+ u-boot \
+ busybox \
+ bash \
+ coreutils \
+ apache \
+ wayland \
+ weston \
+ gstreamer \
+ openssl \
+ openssh \
+ perl \
+ python \
+ php \
+ qt4-embedded \
+ qtbase \
+ qtwebkit \
+ "
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
deleted file mode 100644
index 7e0d12c..0000000
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Target packages for Qt5 SDK"
-LICENSE = "MIT"
-
-PR = "r1"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS_${PN} += " \
- packagegroup-arago-standalone-sdk-target \
- libsqlite3-dev \
- qtbase-mkspecs \
- qtdeclarative-mkspecs \
- qtscript-mkspecs \
- qtwebkit-mkspecs \
- qt3d-mkspecs \
- qtlocation-mkspecs \
- qtsensors-mkspecs \
- qtsvg-mkspecs \
- qtjsbackend-mkspecs \
- qtxmlpatterns-mkspecs \
- qtbase-dev \
- qtdeclarative-dev \
- qtscript-dev \
- qtwebkit-dev \
- qt3d-dev \
- qtlocation-dev \
- qtsensors-dev \
- qtsvg-dev \
- qtjsbackend-dev \
- qtxmlpatterns-dev \
-"
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index 796e7c3..acba6c8 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -1,18 +1,18 @@
DESCRIPTION = "Target packages for Qt Embedded SDK"
LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-QT_SGX_SUPPORT = "\
- libqt-embeddedopengl4-dev \
- libqt-embeddedpvrqwswsegl4-dev \
+QT4_SGX_SUPPORT = "\
+ libqt-embeddedopengl4-dev \
+ libqt-embeddedpvrqwswsegl4-dev \
"
-RDEPENDS_${PN} += " \
+QT4_DEV = " \
packagegroup-arago-standalone-sdk-target \
qt4-embedded-mkspecs \
libqt-embeddedmultimedia4-dev \
@@ -38,5 +38,32 @@ RDEPENDS_${PN} += " \
libqt-embeddedxmlpatterns4-dev \
libqt-embeddedmultimedia4-dev \
libqt-embeddeddeclarative4-dev \
- ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles','${QT_SGX_SUPPORT}', '', d)} \
+ ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles','${QT4_SGX_SUPPORT}', '', d)} \
+"
+
+QT5_DEV = " \
+ packagegroup-arago-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 \
+"
+
+RDEPENDS_${PN} += " \
+ ${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \
"
--
2.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] arago.conf: drop removal of "sgx" feature, update version
2014-08-03 1:10 [PATCH 1/5] base-files: update fstab with recent fstype changes, mount /run Denys Dmytriyenko
` (2 preceding siblings ...)
2014-08-03 1:10 ` [PATCH 4/5] packagegroups, images: combine qt4e and qt5 recipes to avoid confusion Denys Dmytriyenko
@ 2014-08-03 1:10 ` Denys Dmytriyenko
3 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2014-08-03 1:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/arago.conf | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index ff99ef2..4927fe9 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -1,8 +1,6 @@
-QT_PROVIDER = "qt5"
-
# Name and version of the distribution
DISTRO_NAME = "Arago"
-DISTRO_VERSION = "2014.06"
+DISTRO_VERSION = "2014.08"
# SDK paths and names
SDK_NAME_PREFIX = "arago"
@@ -29,6 +27,9 @@ PACKAGECONFIG_pn-weston = "fbdev launch"
PACKAGECONFIG_GL_pn-qtbase = "gles2 linuxfb"
PACKAGECONFIG_DISTRO_pn-qtbase = "icu"
+# Set preferred Qt version
+QT_PROVIDER = "qt5"
+
# ARM9 is not supported by the Linaro toolchain so default back to the Arago
# toolchain for ARM9 based SOCs.
TC_SANE_DEFAULT := "${@bb.utils.contains('SOC_FAMILY','omapl138','arago','linaro',d)}"
@@ -48,9 +49,6 @@ TARGET_CPPFLAGS += "-fstack-protector"
# Load default preferences
require conf/distro/include/arago-prefs.inc
-# Hack out sgx flag for now, as breaking on kernels >= 3.14
-MACHINE_FEATURES_remove = "sgx"
-
# Remove the ASSUME_PROVIDED setting for git-native so that we can
# use the latest version for the sourceipk which leads to a smaller
# git history.
--
2.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 4/5] packagegroups, images: combine qt4e and qt5 recipes to avoid confusion
2014-08-03 1:10 ` [PATCH 4/5] packagegroups, images: combine qt4e and qt5 recipes to avoid confusion Denys Dmytriyenko
@ 2014-08-04 13:48 ` Maupin, Chase
0 siblings, 0 replies; 6+ messages in thread
From: Maupin, Chase @ 2014-08-04 13:48 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Saturday, August 02, 2014 8:10 PM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 4/5] packagegroups, images: combine
>qt4e and qt5 recipes to avoid confusion
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>It was started as a fix to prevent qt4-embedded from being pulled
>into the
>build when building qt5 and would have required creating empty
>qt5-specific
>packagegroup-arago-tisdk-qt5-sdk-host recipe. Unification was in
>order.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../recipes-core/images/arago-qt5-test-image.bb | 19 ---------
>--
> .../recipes-core/images/tisdk-rootfs-image.bb | 2 +-
> .../packagegroups/packagegroup-arago-qt5.bb | 15 ---------
> .../packagegroups/packagegroup-arago-qte.bb | 20 ++++++++-
>--
> .../packagegroups/packagegroup-arago-tisdk-qt5.bb | 18 ---------
>-
> .../packagegroup-arago-tisdk-qte-sdk-host.bb | 8 +++--
> .../packagegroups/packagegroup-arago-tisdk-qte.bb | 15 +++++++--
> .../packagegroups/packagegroup-linaro-tc-test.bb | 24
>+++++++++++++
> .../packagegroup-arago-qt5-toolchain-target.bb | 33 ---------
>---------
> .../packagegroup-arago-qte-toolchain-target.bb | 39
>++++++++++++++++++----
> 10 files changed, 92 insertions(+), 101 deletions(-)
> delete mode 100644 meta-arago-distro/recipes-core/images/arago-
>qt5-test-image.bb
> delete mode 100644 meta-arago-distro/recipes-
>core/packagegroups/packagegroup-arago-qt5.bb
> delete mode 100644 meta-arago-distro/recipes-
>core/packagegroups/packagegroup-arago-tisdk-qt5.bb
> create mode 100644 meta-arago-distro/recipes-
>core/packagegroups/packagegroup-linaro-tc-test.bb
> delete mode 100644 meta-arago-extras/recipes-
>core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
>
>diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-test-
>image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-test-
>image.bb
>deleted file mode 100644
>index 5fbbfd3..0000000
>--- a/meta-arago-distro/recipes-core/images/arago-qt5-test-
>image.bb
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-# Arago Qt5 test image
>-# gives you an image with Qt5 for basic testing purposes.
>-
>-require arago-image.inc
>-inherit remove-net-rules
>-
>-IMAGE_INSTALL += "\
>- packagegroup-arago-base \
>- packagegroup-arago-console \
>- packagegroup-arago-base-tisdk \
>- qtbase-plugins \
>- qt-tstat \
>- "
>-
>-# These are now disabled due to gles dependency
>-# matrix-gui-browser
>-# qtwebkit-examples-examples
>-
>-export IMAGE_BASENAME = "arago-qt5-test-image"
>diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-
>image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-
>image.bb
>index 649dfe3..1bc6a36 100644
>--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
>+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
>@@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb
> IMAGE_INSTALL += "\
> packagegroup-arago-test \
> ${@base_contains('MACHINE_FEATURES','sgx','packagegroup-
>arago-tisdk-graphics','',d)} \
>- ${@base_conditional('QT_PROVIDER','qt5','packagegroup-arago-
>tisdk-qt5','packagegroup-arago-tisdk-qte',d)} \
>+ packagegroup-arago-tisdk-qte \
> packagegroup-arago-tisdk-addons \
> packagegroup-arago-tisdk-connectivity \
> packagegroup-arago-tisdk-crypto \
>diff --git a/meta-arago-distro/recipes-
>core/packagegroups/packagegroup-arago-qt5.bb b/meta-arago-
>distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
>deleted file mode 100644
>index ff0f3ed..0000000
>--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-qt5.bb
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-DESCRIPTION = "Task to add Qt embedded related packages"
>-LICENSE = "MIT"
>-PR = "r0"
>-
>-inherit packagegroup
>-
>-PACKAGE_ARCH = "${MACHINE_ARCH}"
>-
>-RDEPENDS_${PN} = "\
>- qtbase-plugins \
>- qtdeclarative-plugins \
>- qtlocation-plugins \
>- qtmultimedia-plugins \
>- qtwayland-plugins \
>-"
>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 0ce08db..b2dd546 100644
>--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-qte.bb
>+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-qte.bb
>@@ -1,18 +1,18 @@
> DESCRIPTION = "Task to add Qt embedded related packages"
> LICENSE = "MIT"
>-PR = "r4"
>+PR = "r5"
>
> inherit packagegroup
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
>-QT_SGX_SUPPORT = "\
>+QT4_SGX_SUPPORT = "\
> qt4-embedded-plugin-gfxdriver-gfxpvregl \
> libqt-embeddedopengl4 \
> libqt-embeddedpvrqwswsegl4 \
> "
>
>-RDEPENDS_${PN} = "\
>+QT4_ESSENTIALS = "\
> qt4-embedded \
> qt4-embedded-plugin-mousedriver-tslib \
> qt4-embedded-plugin-gfxdriver-gfxtransformed \
>@@ -23,5 +23,17 @@ RDEPENDS_${PN} = "\
> libqt-embeddedmultimedia4 \
> libqt-embeddeddeclarative4 \
> libqt-embeddedxmlpatterns4 \
>- ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
>'${QT_SGX_SUPPORT}', '', d)} \
>+ ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
>'${QT4_SGX_SUPPORT}', '', d)} \
>+"
>+
>+QT5_ESSENTIALS = "\
>+ qtbase-plugins \
>+ qtdeclarative-plugins \
>+ qtlocation-plugins \
>+ qtmultimedia-plugins \
>+ qtwayland-plugins \
>+"
>+
>+RDEPENDS_${PN} = "\
>+ ${@base_conditional('QT_PROVIDER', 'qt5',
>"${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
> "
>diff --git a/meta-arago-distro/recipes-
>core/packagegroups/packagegroup-arago-tisdk-qt5.bb b/meta-arago-
>distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt5.bb
>deleted file mode 100644
>index 9ce43e6..0000000
>--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>arago-tisdk-qt5.bb
>+++ /dev/null
>@@ -1,18 +0,0 @@
>-DESCRIPTION = "Task to add Qt embedded related packages"
>-LICENSE = "MIT"
>-PR = "r0"
>-
>-inherit packagegroup
>-
>-PACKAGE_ARCH = "${MACHINE_ARCH}"
>-
>-QT_DEMOS = "\
>- qtwayland-examples \
>- qtwebkit-examples-examples \
>- qt-tstat \
>-"
>-
>-RDEPENDS_${PN} = "\
>- packagegroup-arago-qt5 \
>- ${QT_DEMOS} \
>-"
>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 4cb85fe..3615cd4 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,16 +1,20 @@
> DESCRIPTION = "Task to add Qt embedded related sources into the
>sdk"
> LICENSE = "MIT"
>-PR = "r3"
>+PR = "r4"
>
> inherit packagegroup
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
>+QT4_DEMOS = "\
>+ ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
>'quick-playground-src', '', d)} \
>+"
>+
> QT_DEMOS = "\
> qt-tstat-src \
>- ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
>'quick-playground-src', '', d)} \
> "
>
> RDEPENDS_${PN} = "\
>+ ${@base_conditional('QT_PROVIDER', 'qt5', '', "${QT4_DEMOS}",
>d)} \
> ${QT_DEMOS} \
> "
>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 10187a6..e745a08 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,19 +1,28 @@
> DESCRIPTION = "Task to add Qt embedded related packages"
> LICENSE = "MIT"
>-PR = "r4"
>+PR = "r5"
>
> inherit packagegroup
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
>-QT_DEMOS = "\
>+QT4_DEMOS = "\
> qt4-embedded-examples \
> qt4-embedded-demos \
>- qt-tstat \
> ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
>'quick-playground', '', d)} \
> "
>
>+QT5_DEMOS = "\
>+ qtwayland-examples \
>+ qtwebkit-examples-examples \
>+"
>+
>+QT_DEMOS = "\
>+ qt-tstat \
>+"
>+
> RDEPENDS_${PN} = "\
> packagegroup-arago-qte \
>+ ${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DEMOS}",
>"${QT4_DEMOS}", d)} \
> ${QT_DEMOS} \
> "
>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
>new file mode 100644
>index 0000000..8fd863e
>--- /dev/null
>+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-
>linaro-tc-test.bb
>@@ -0,0 +1,24 @@
>+DESCRIPTION = "Group of packages to build with Linaro toolchain
>for testing"
>+LICENSE = "MIT"
>+
>+inherit packagegroup
>+
>+RDEPENDS_${PN} = "\
>+ virtual/kernel \
>+ u-boot \
>+ busybox \
>+ bash \
>+ coreutils \
>+ apache \
>+ wayland \
>+ weston \
>+ gstreamer \
>+ openssl \
>+ openssh \
>+ perl \
>+ python \
>+ php \
>+ qt4-embedded \
>+ qtbase \
>+ qtwebkit \
>+ "
>diff --git a/meta-arago-extras/recipes-
>core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
>b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-
>qt5-toolchain-target.bb
>deleted file mode 100644
>index 7e0d12c..0000000
>--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-
>arago-qt5-toolchain-target.bb
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-DESCRIPTION = "Target packages for Qt5 SDK"
>-LICENSE = "MIT"
>-
>-PR = "r1"
>-
>-inherit packagegroup
>-
>-PACKAGE_ARCH = "${MACHINE_ARCH}"
>-
>-RDEPENDS_${PN} += " \
>- packagegroup-arago-standalone-sdk-target \
>- libsqlite3-dev \
>- qtbase-mkspecs \
>- qtdeclarative-mkspecs \
>- qtscript-mkspecs \
>- qtwebkit-mkspecs \
>- qt3d-mkspecs \
>- qtlocation-mkspecs \
>- qtsensors-mkspecs \
>- qtsvg-mkspecs \
>- qtjsbackend-mkspecs \
>- qtxmlpatterns-mkspecs \
>- qtbase-dev \
>- qtdeclarative-dev \
>- qtscript-dev \
>- qtwebkit-dev \
>- qt3d-dev \
>- qtlocation-dev \
>- qtsensors-dev \
>- qtsvg-dev \
>- qtjsbackend-dev \
>- qtxmlpatterns-dev \
>-"
>diff --git a/meta-arago-extras/recipes-
>core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
>b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-
>qte-toolchain-target.bb
>index 796e7c3..acba6c8 100644
>--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-
>arago-qte-toolchain-target.bb
>+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-
>arago-qte-toolchain-target.bb
>@@ -1,18 +1,18 @@
> DESCRIPTION = "Target packages for Qt Embedded SDK"
> LICENSE = "MIT"
>
>-PR = "r6"
>+PR = "r7"
>
> inherit packagegroup
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
>-QT_SGX_SUPPORT = "\
>- libqt-embeddedopengl4-dev \
>- libqt-embeddedpvrqwswsegl4-dev \
>+QT4_SGX_SUPPORT = "\
>+ libqt-embeddedopengl4-dev \
>+ libqt-embeddedpvrqwswsegl4-dev \
> "
>
>-RDEPENDS_${PN} += " \
>+QT4_DEV = " \
> packagegroup-arago-standalone-sdk-target \
> qt4-embedded-mkspecs \
> libqt-embeddedmultimedia4-dev \
>@@ -38,5 +38,32 @@ RDEPENDS_${PN} += " \
> libqt-embeddedxmlpatterns4-dev \
> libqt-embeddedmultimedia4-dev \
> libqt-embeddeddeclarative4-dev \
>- ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-
>gles','${QT_SGX_SUPPORT}', '', d)} \
>+ ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-
>gles','${QT4_SGX_SUPPORT}', '', d)} \
>+"
>+
>+QT5_DEV = " \
>+ packagegroup-arago-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 \
>+"
>+
>+RDEPENDS_${PN} += " \
>+ ${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}",
>"${QT4_DEV}", d)} \
> "
>--
>2.0.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-08-04 13:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-03 1:10 [PATCH 1/5] base-files: update fstab with recent fstype changes, mount /run Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 2/5] arago-image.inc: add udev-extraconf unconditionally to all images Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 3/5] recipes: replace base_contains with base_conditional when not used on lists Denys Dmytriyenko
2014-08-03 1:10 ` [PATCH 4/5] packagegroups, images: combine qt4e and qt5 recipes to avoid confusion Denys Dmytriyenko
2014-08-04 13:48 ` Maupin, Chase
2014-08-03 1:10 ` [PATCH 5/5] arago.conf: drop removal of "sgx" feature, update version Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.