Skip to contentSkip to conversation

Non-sgx build cleanup

PATCH New Eric Ruei 1 participant 4 messages May 31, 2019

lore
Share & tools
lore

Eric Ruei

author
#0 lore raw

cover Non-sgx build cleanup

-enable AM5/6 support
-Remove obsolete components and recipes

Eric Ruei (3):
tisdk-roofs-image: add packagegroup-arago-tisdk-graphics
unconditionally
packagegroup-arago-qte: remove qtquick1 components
ti-sgx-ddk-um: remove unused file

 recipes-core/images/tisdk-rootfs-image.bbappend           | 8 +++++++-
 .../packagegroups/packagegroup-arago-qte.bbappend         | 4 ++--
 .../packagegroups/packagegroup-arago-tisdk-qte.bbappend   | 4 ++--
 .../libgles/ti-sgx-ddk-um_1.14.3699939.bbappend           | 4 ----
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bbappend
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/3 tisdk-roofs-image: add packagegroup-arago-tisdk-graphics unconditionally

packagegroup-arago-tisdk-graphics is required for both sgx and non-sgx builds for AM3/4/5/6

---
 recipes-core/images/tisdk-rootfs-image.bbappend | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
recipes-core/images/tisdk-rootfs-image.bbappend +7 -1
index 6f6c3bc..180bb0c 100644
@@ -1,4 +1,4 @@
-PR_append = ".tisdk6"
+PR_append = ".tisdk7"
 
 # Disable ros-world until it can be fixed
 #	packagegroup-ros-world
@@ -17,6 +17,12 @@ IMAGE_INSTALL_append_ti33x = " \
 
 #	packagegroup-ros-world
 IMAGE_INSTALL_append_omap-a15 = " \
+	packagegroup-arago-tisdk-graphics \
 	packagegroup-arago-tisdk-hmi \
 	packagegroup-ros-ti \
 "
+
+#	packagegroup-ros-world
+IMAGE_INSTALL_append_k3 = " \
+	packagegroup-arago-tisdk-graphics \
+"
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 2/3 packagegroup-arago-qte: remove qtquick1 components

In reply to Eric Ruei

qtquick1 is obsolete.

---
 recipes-core/packagegroups/packagegroup-arago-qte.bbappend    | 4 ++--
 .../packagegroups/packagegroup-arago-tisdk-qte.bbappend       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
recipes-core/packagegroups/packagegroup-arago-qte.bbappend +2 -2
index ac545ec..0acf47d 100644
@@ -1,9 +1,9 @@
-PR_append = ".tisdk0"
+PR_append = ".tisdk1"
 
 QT5_ESSENTIALS_remove = "\
     ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', 'qtwebengine-qmlplugins', d)} \
 "
 
 QT5_ESSENTIALS_append = "\
-    ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', ' qtwebkit-qmlplugins qtquick1-plugins qtquick1-qmlplugins', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', 'qtwebkit-qmlplugins', d)} \
 "
recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bbappend +2 -2
index 6fa1035..85954fc 100644
@@ -1,9 +1,9 @@
-PR_append = ".tisdk0"
+PR_append = ".tisdk1"
 
 QT5_DEMOS_remove = "\
     ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', 'qtwebengine-examples', d)} \
 "
 
 QT5_DEMOS_append = "\
-    ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', ' qtquick1-examples qtwebkit-examples-examples', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', 'qtwebkit-examples-examples', d)} \
 "
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 3/3 ti-sgx-ddk-um: remove unused file

In reply to Eric Ruei

ti-sgx-ddk-um_1.14.3699939 is no longer needed

---
 recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bbappend | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bbappend
recipes-graphics/libgles/ti-sgx-ddk-um_1.14.3699939.bbappend deleted +0 -4
deleted file mode 100644
index 0c2dcac..0000000
@@ -1,4 +0,0 @@
-PR_append = ".tisdk8"
-
-BRANCH = "${@bb.utils.contains('MACHINE_FEATURES','sgx','ti-img-sgx/rocko/${PV}','ti-img-sgx-nohardware/${PV}',d)}"
-SRCREV = "${@bb.utils.contains('MACHINE_FEATURES','sgx','bc62c9d0c590dfbc801bf6b10176c3a8b6a39d98','07acdd3981364d5c4afdcb250e30d392bb53f951',d)}"
Signature · 1 line
2.17.1