This reverts commit eb3bb15505c323caff683781bea5008f8a417af0.
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
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
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
