All of lore.kernel.org
 help / color / mirror / Atom feed
* [rocko/master][PATCH 1/2] matrix-gui-hmi-demos: RDEPENDS on bash
@ 2018-03-15 20:27 Denys Dmytriyenko
  2018-03-15 20:27 ` [rocko/master][PATCH 2/2] images: re-enable matrix, as php no longer blacklised upstream Denys Dmytriyenko
  0 siblings, 1 reply; 2+ messages in thread
From: Denys Dmytriyenko @ 2018-03-15 20:27 UTC (permalink / raw)
  To: meta-arago

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
index f2ea2ed..933a002 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-hmi-demos_2.0.bb
@@ -19,11 +19,13 @@ PACKAGES = "matrix-hmi-demo-evse \
 "
 
 RDEPENDS_matrix-hmi-demo-evse = " \
+    bash \
     ${HMI_RDEPENDS} \
     evse-hmi \
 "
 
 RDEPENDS_matrix-hmi-demo-protection-relays = " \
+    bash \
     ${HMI_RDEPENDS} \
     protection-relays-hmi \
 "
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [rocko/master][PATCH 2/2] images: re-enable matrix, as php no longer blacklised upstream
  2018-03-15 20:27 [rocko/master][PATCH 1/2] matrix-gui-hmi-demos: RDEPENDS on bash Denys Dmytriyenko
@ 2018-03-15 20:27 ` Denys Dmytriyenko
  0 siblings, 0 replies; 2+ messages in thread
From: Denys Dmytriyenko @ 2018-03-15 20:27 UTC (permalink / raw)
  To: meta-arago

This reverts commit eb3bb15505c323caff683781bea5008f8a417af0.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc   | 3 +--
 meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb        | 5 ++---
 meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
index e369c3f..673a56d 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
@@ -51,13 +51,12 @@ IMAGE_INSTALL_QT = "\
 IMAGE_INSTALL_QT_keystone = ""
 IMAGE_INSTALL_QT_omapl138 = ""
 
-# Disable in master due to php breakage
-#    packagegroup-arago-tisdk-matrix-sdk-host
 IMAGE_INSTALL = "\
     packagegroup-arago-tisdk-addons-sdk-host \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-sdk-host','',d)} \
     packagegroup-arago-tisdk-crypto-sdk-host \
     ${@bb.utils.contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics-sdk-host','',d)} \
+    packagegroup-arago-tisdk-matrix-sdk-host \
     packagegroup-arago-tisdk-multimedia-sdk-host \
     packagegroup-arago-tisdk-hmi-sdk-host \
     packagegroup-arago-tisdk-amsdk-sdk-host${ARAGO_KERNEL_SUFFIX} \
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 471bbc7..e40dc1f 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -2,9 +2,6 @@
 
 require arago-image.inc
 
-# Disabled in master due to php breakage
-#    packagegroup-arago-tisdk-matrix
-#    packagegroup-arago-tisdk-matrix-extra
 IMAGE_INSTALL += "\
     packagegroup-arago-base \
     packagegroup-arago-console \
@@ -17,6 +14,8 @@ IMAGE_INSTALL += "\
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
+    packagegroup-arago-tisdk-matrix \
+    packagegroup-arago-tisdk-matrix-extra \
     packagegroup-arago-tisdk-multimedia \
     packagegroup-arago-tisdk-amsdk \
     packagegroup-arago-tisdk-addons \
diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
index 5f4caa6..b64d092 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
@@ -4,12 +4,11 @@ require arago-base-tisdk-image.bb
 
 SPLASH = ""
 
-# Disable in master due to php breakage
-#    packagegroup-arago-tisdk-matrix
 IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-addons \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
     packagegroup-arago-tisdk-crypto \
+    packagegroup-arago-tisdk-matrix \
     packagegroup-arago-base-tisdk-server-extra \
     packagegroup-arago-tisdk-connectivity \
 "
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-15 20:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-15 20:27 [rocko/master][PATCH 1/2] matrix-gui-hmi-demos: RDEPENDS on bash Denys Dmytriyenko
2018-03-15 20:27 ` [rocko/master][PATCH 2/2] images: re-enable matrix, as php no longer blacklised upstream 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.