[PATCH 0/6] Upgrade OpenCL and dependencies

[PATCH 0/6] Upgrade OpenCL and dependencies

[Jacob Stiffler]

* Upgrade OpenCL to 1.1.7.2
  - Resolves LCPD-5402
* Extend support to keystone SOCs

Jacob Stiffler (6):
  ti-llvm3.6: Upgrade ti-llvm from version 3.3 to 3.6
  ocl: Upgrade to version 1.1.7.2
  packagegroup-arago-tisdk-addons*: Add OpenCL and related packages for
    keystone
  ti-tisdk-makefile: Add OpenCL and related targets for keystone
  packagegroup-arago-tisdk-matrix: Add OpenCL matrix demos for keystone
  tisdk-server-rootfs-image: Add unnecessary dev packages to
    BAD_RECOMMENDATIONS

 .../images/tisdk-server-rootfs-image.bb            |  7 ++++
 .../packagegroup-arago-tisdk-addons-sdk-host.bb    | 29 ++++++++++++-
 .../packagegroup-arago-tisdk-addons-sdk-target.bb  | 14 ++++++-
 .../packagegroup-arago-tisdk-addons.bb             | 21 ++++++++++
 .../packagegroup-arago-tisdk-matrix.bb             | 17 +++++++-
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb     | 19 ++++++++-
 ...e-Do-not-check-build-executable-extension.patch | 25 +-----------
 .../llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb}  | 47 ++++++++++++++++++----
 meta-arago-extras/recipes-ti/ocl/clocl_git.bb      |  4 +-
 meta-arago-extras/recipes-ti/ocl/ocl.inc           |  4 +-
 .../recipes-ti/ocl/opencl-examples_git.bb          |  6 ++-
 .../recipes-ti/ocl/opencl-monitor_git.bb           | 35 ++++++++++++++--
 meta-arago-extras/recipes-ti/ocl/opencl_git.bb     | 16 +++++---
 13 files changed, 193 insertions(+), 51 deletions(-)
 rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3 => ti-llvm3.6}/0001-configure-Do-not-check-build-executable-extension.patch (56%)
 rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb} (67%)

-- 
1.9.1

[PATCH 1/6] ti-llvm3.6: Upgrade ti-llvm from version 3.3 to 3.6

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 ...e-Do-not-check-build-executable-extension.patch | 25 +-----------
 .../llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb}  | 47 ++++++++++++++++++----
 2 files changed, 40 insertions(+), 32 deletions(-)
 rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3 => ti-llvm3.6}/0001-configure-Do-not-check-build-executable-extension.patch (56%)
 rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb} (67%)

diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
similarity index 56%
rename from meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch
rename to meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
index b6e5331..9a60caf 100644
--- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch
+++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
@@ -9,8 +9,7 @@ Subject: [PATCH] configure: Do not check build executable extension.
 Signed-off-by: Jake Stiffler <j-stiffler@ti.com>
 ---
  configure                 |    3 +++
- projects/sample/configure |    4 ++++
- 2 files changed, 7 insertions(+)
+ 1 files changed, 3 insertions(+)
 
 diff --git a/configure b/configure
 index decbc40..387c4fd 100755
@@ -33,28 +32,6 @@ index decbc40..387c4fd 100755
    rm -f conftest*
    test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank
  fi
-diff --git a/projects/sample/configure b/projects/sample/configure
-index a2c70c6..b57f21c 100755
---- a/projects/sample/configure
-+++ b/projects/sample/configure
-@@ -4753,6 +4753,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_build_exeext=
-+
-+if false; then
-   if { (eval echo "$as_me:$LINENO: \"$ac_build_link\"") >&5
-   (eval $ac_build_link) 2>&5
-   ac_status=$?
-@@ -4769,6 +4771,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
- echo "$as_me: error: installation or configuration problem: compiler cannot create executables." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-+fi
-+
-   rm -f conftest*
-   test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank
- fi
 -- 
 1.7.9.5
 
diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
similarity index 67%
rename from meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb
rename to meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
index 35514c4..2c53f1f 100644
--- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb
+++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "LLVM 3.3 with support for TI C66x intrinsics"
+DESCRIPTION = "LLVM 3.6 with support for TI C66x intrinsics"
 HOMEPAGE = "https://gitorious.design.ti.com/ocl/llvm33-src"
 
-PR = "r1"
+PR = "r2"
 
 do_configure_prepend_class-native() {
     # Fix paths in llvm-config
@@ -10,27 +10,48 @@ do_configure_prepend_class-native() {
 
 require recipes-core/llvm/llvm.inc
 
-DEPENDS += "zlib libxml2"
-EXTRA_OECONF += "--enable-zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
+
+DEPENDS += "libxml2"
+EXTRA_OECONF += ""
 
 
 LLVM_DIR = "ti-llvm${PV}"
 
-BRANCH = "master"
+LLVM_GIT_NAME = "llvm"
+LLVM_GIT_URI = "git://git.ti.com/opencl/llvm.git"
+LLVM_GIT_PROTOCOL = "git"
+LLVM_GIT_BRANCH = "release_36_ti"
+LLVM_GIT_DESTSUFFIX = "git"
+LLVM_GIT_SRCREV = "2ff2f1fe65645f9323372e382d0fd9647462abcb"
+
+CLANG_GIT_NAME = "clang"
+CLANG_GIT_URI = "git://git.ti.com/opencl/clang.git"
+CLANG_GIT_PROTOCOL = "git"
+CLANG_GIT_BRANCH = "release_36_ti"
+CLANG_GIT_DESTSUFFIX = "${LLVM_GIT_DESTSUFFIX}/tools/clang"
+CLANG_GIT_SRCREV = "7b43bc10396ecdd141cec40acacbc240ac76a84f"
 
 SRC_URI = " \
-  git://git.ti.com/opencl/ti-llvm-clang-3_3.git;protocol=git;branch=${BRANCH} \
+  ${LLVM_GIT_URI};protocol=${LLVM_GIT_PROTOCOL};branch=${LLVM_GIT_BRANCH};destsuffix=${LLVM_GIT_DESTSUFFIX};name=${LLVM_GIT_NAME} \
+  ${CLANG_GIT_URI};protocol=${CLANG_GIT_PROTOCOL};branch=${CLANG_GIT_BRANCH};destsuffix=${CLANG_GIT_DESTSUFFIX};name=${CLANG_GIT_NAME} \
   file://0001-configure-Do-not-check-build-executable-extension.patch \
 "
 
-
-SRCREV = "29629a3e70d445cfbfbb4046a56d3648ebae9544"
+SRCREV_${LLVM_GIT_NAME} = "${LLVM_GIT_SRCREV}"
+SRCREV_${CLANG_GIT_NAME} = "${CLANG_GIT_SRCREV}"
 
 S = "${WORKDIR}/git"
 
 LIBXML2_INC = "`pkg-config libxml-2.0 --cflags`"
 LIBXML2_LIBS = "`pkg-config libxml-2.0 --libs`"
 
+EXTRA_OECONF += " --enable-targets="host,arm,c6000,msp430" \
+                  --disable-zlib \
+                  --disable-terminfo \
+                  --disable-libedit \
+"
+
 EXTRA_OEMAKE += "LIBXML2_INC="${LIBXML2_INC}" LIBXML2_LIBS="${LIBXML2_LIBS}""
 
 do_compile_class-native() {
@@ -54,6 +75,13 @@ do_compile_class-nativesdk() {
         RANLIB="${BUILD_RANLIB}" \
         PATH="${STAGING_BINDIR_NATIVE}:$PATH" \
         cross-compile-build-tools
+
+    # Workaround for timestamp issue on built-tools
+    for f in ${LLVM_BUILD_DIR}/BuildTools/Release/bin/*
+    do
+        touch $f
+    done
+
     oe_runmake
 }
 
@@ -95,6 +123,7 @@ do_install_class-native() {
     install -m 0755 ${LLVM_INSTALL_DIR}/llvm-config${PV}-ti ${D}${bindir}
 }
 
+
 SYSROOT_PREPROCESS_FUNCS_class-target += "llvm_sysroot_preprocess_target"
 SYSROOT_PREPROCESS_FUNCS_class-nativesdk += "llvm_sysroot_preprocess_target"
 
@@ -107,4 +136,6 @@ llvm_sysroot_preprocess_target() {
     mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}-ti
 }
 
+INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.0 += "dev-so"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
1.9.1

[PATCH 2/6] ocl: Upgrade to version 1.1.7.2

[Jacob Stiffler]

* Extend support to keystone SOCs

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-ti/ocl/clocl_git.bb      |  4 +--
 meta-arago-extras/recipes-ti/ocl/ocl.inc           |  4 +--
 .../recipes-ti/ocl/opencl-examples_git.bb          |  6 +++-
 .../recipes-ti/ocl/opencl-monitor_git.bb           | 35 +++++++++++++++++++---
 meta-arago-extras/recipes-ti/ocl/opencl_git.bb     | 16 ++++++----
 5 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
index 94e9e34..bf00267 100644
--- a/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/clocl_git.bb
@@ -6,11 +6,11 @@ include ocl.inc
 
 PR = "${INC_PR}.0"
 
-DEPENDS = "ti-llvm3.3 ti-llvm3.3-native boost"
+DEPENDS = "ti-llvm3.6 ti-llvm3.6-native boost"
 
 S = "${WORKDIR}/git/host"
 
-export WANT_LLVM_RELEASE = "3.3-ti"
+export WANT_LLVM_RELEASE = "3.6-ti"
 
 TARGET_class-target = "arm"
 TARGET_class-native = "x86"
diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
index 66e1f37..18690e7 100644
--- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
+++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
@@ -1,4 +1,4 @@
-PV = "1.1.6"
+PV = "1.1.7.2"
 INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
@@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
 OCL_GIT_PROTOCOL = "git"
 OCL_GIT_BRANCH = "master"
 
-OCL_SRCREV = "992dfba8783af895f6d4e4877ad7c0466d085bf0"
+OCL_SRCREV = "b437300df647551ebd5df7130576c726155eee4d"
 
 BRANCH = "${OCL_GIT_BRANCH}"
 SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index af225d1..344d2d0 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -6,7 +6,7 @@ include ocl.inc
 
 PR = "${INC_PR}.0"
 
-COMPATIBLE_MACHINE = "dra7xx|k2hk-evm"
+COMPATIBLE_MACHINE = "dra7xx|k2hk-evm|k2l-evm|k2e-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "opencl ti-cgt6x-native clocl-native"
@@ -30,6 +30,10 @@ OCL_EXAMPLE_LIST = " buffer \
                      matmpy \
                      ooo_callback \
                      edmamgr \
+                     sgemm \
+                     vecadd_openmp \
+                     vecadd_openmp_t \
+                     dgemm \
 "
 
 python do_unpack_append() {
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
index 3a277e9..1f0a849 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -5,11 +5,11 @@ LICENSE = "BSD"
 include ocl.inc
 require recipes-ti/includes/ti-paths.inc
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 
 inherit cmake update-alternatives
 
-DEPENDS = " ti-llvm3.3-native \
+DEPENDS = " ti-llvm3.6-native \
             common-csl-ip-rtos \
             ti-xdctools \
             ti-ipc-rtos \
@@ -20,28 +20,55 @@ DEPENDS = " ti-llvm3.3-native \
             ti-framework-components \
             libulm \
             gdbserver-c6x \
+            openmp-rtos \
 "
 
-COMPATIBLE_MACHINE = "dra7xx|k2hk-evm"
+DEPENDS_append_k2hk-evm = " multiprocmgr-rtos \
+                            qmss-lld-rtos \
+                            cppi-lld-rtos \
+                            rm-lld-rtos \
+"
+
+DEPENDS_append_k2l-evm  = " multiprocmgr-rtos \
+                            qmss-lld-rtos \
+                            cppi-lld-rtos \
+                            rm-lld-rtos \
+"
+
+DEPENDS_append_k2e-evm  = " multiprocmgr-rtos \
+                            qmss-lld-rtos \
+                            cppi-lld-rtos \
+                            rm-lld-rtos \
+"
+
+COMPATIBLE_MACHINE = "dra7xx|k2hk-evm|k2l-evm|k2e-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git/monitor"
 S_dra7xx = "${WORKDIR}/git/monitor_vayu"
 
+BUILD_TARGET_k2hk-evm = "ARM_K2H"
+BUILD_TARGET_k2l-evm  = "ARM_K2L"
+BUILD_TARGET_k2e-evm  = "ARM_K2E"
+
 EXTRA_OECMAKE += " -DCROSS_COMPILE=TRUE \
                    -DOCL_MONITOR_DIR=${S} \
                    -DBUILD_OUTPUT=all \
                    -DSHARE_PATH=${datadir}/ti \
+                   -DBUILD_TARGET=${BUILD_TARGET} \
 "
 
 export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export PDK_DIR = "${PDK_INSTALL_DIR}"
+export AM57_PDK_DIR = "${PDK_INSTALL_DIR}"
+export C6636_PDK_DIR = "${PDK_INSTALL_DIR}"
 export IPC_DIR = "${IPC_INSTALL_DIR}"
 export XDC_DIR = "${XDC_INSTALL_DIR}"
 export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}"
 export EDMA3LLD_DIR = "${EDMA3_LLD_INSTALL_DIR}"
 export XDAIS_DIR = "${XDAIS_INSTALL_DIR}"
 export FC_DIR = "${FC_INSTALL_DIR}"
+export MPM_DIR = "${MPM_INSTALL_DIR}"
+export OMP_DIR = "${OMP_INSTALL_DIR}"
 export ULM_DIR ="${STAGING_DIR_TARGET}/usr/share/ti/ulm"
 export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x"
 export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr"
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 568e249..de97844 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.0"
 
 inherit cmake
 
-COMPATIBLE_MACHINE = "dra7xx|k2hk-evm"
+COMPATIBLE_MACHINE = "dra7xx|k2hk-evm|k2l-evm|k2e-evm"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES += " ${PN}-runtime"
@@ -17,8 +17,8 @@ DEPENDS = " ocl-gl-headers \
             opencl-monitor \
             cmake-native \
             cmem \
-            ti-llvm3.3 \
-            ti-llvm3.3-native \
+            ti-llvm3.6 \
+            ti-llvm3.6-native \
             binutils \
             sqlite3 \
             libffi \
@@ -29,8 +29,10 @@ DEPENDS = " ocl-gl-headers \
             libulm \
 "
 
-DEPENDS_append_dra7xx += "ti-ipc virtual/kernel"
+DEPENDS_append_dra7xx   += " ti-ipc virtual/kernel"
 DEPENDS_append_k2hk-evm += " mpm-transport multiprocmgr"
+DEPENDS_append_k2l-evm  += " mpm-transport multiprocmgr"
+DEPENDS_append_k2e-evm  += " mpm-transport multiprocmgr"
 
 RDEPENDS_${PN}-dev += " ocl-gl-headers-dev opencl-monitor"
 RDEPENDS_${PN}-runtime += " ${PN} opencl-monitor clocl ti-cgt6x"
@@ -40,10 +42,12 @@ ALLOW_EMPTY_${PN}-runtime = "1"
 
 S = "${WORKDIR}/git/host"
 
-export WANT_LLVM_RELEASE = "3.3-ti"
+export WANT_LLVM_RELEASE = "3.6-ti"
 
-OCL_BUILD_TARGET_dra7xx = "ARM_AM57"
+OCL_BUILD_TARGET_dra7xx   = "ARM_AM57"
 OCL_BUILD_TARGET_k2hk-evm = "ARM_K2H"
+OCL_BUILD_TARGET_k2l-evm  = "ARM_K2L"
+OCL_BUILD_TARGET_k2e-evm  = "ARM_K2E"
 
 EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABLE_ULM=1"
 
-- 
1.9.1

[PATCH 3/6] packagegroup-arago-tisdk-addons*: Add OpenCL and related packages for keystone

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../packagegroup-arago-tisdk-addons-sdk-host.bb    | 29 +++++++++++++++++++++-
 .../packagegroup-arago-tisdk-addons-sdk-target.bb  | 14 ++++++++++-
 .../packagegroup-arago-tisdk-addons.bb             | 21 ++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
index c5ffbe9..eed469d 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install sources for additional utilities/demos for SDKs"
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -35,6 +35,18 @@ UTILS_append_dra7xx = " \
     opencl-examples-src \
 "
 
+UTILS_append_k2hk-evm = " \
+    opencl-examples-src \
+"
+
+UTILS_append_k2l-evm = " \
+    opencl-examples-src \
+"
+
+UTILS_append_k2e-evm = " \
+    opencl-examples-src \
+"
+
 EXTRA_LIBS = ""
 
 EXTRA_LIBS_append_omap-a15 = " \
@@ -53,6 +65,21 @@ EXTRA_LIBS_append_keystone = " \
     hplib-mod-src \
 "
 
+EXTRA_LIBS_append_k2hk-evm = " \
+    debugss-module-drv-src \
+    gdbserverproxy-module-drv-src \
+"
+
+EXTRA_LIBS_append_k2l-evm = " \
+    debugss-module-drv-src \
+    gdbserverproxy-module-drv-src \
+"
+
+EXTRA_LIBS_append_k2e-evm = " \
+    debugss-module-drv-src \
+    gdbserverproxy-module-drv-src \
+"
+
 RDEPENDS_${PN} = "\
     ${UTILS} \
     ${EXTRA_LIBS} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index 7d5b290..12352eb 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install headers and libraries related to addons into the SDK"
 LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -121,6 +121,9 @@ UTILS_append_ti43x = " canutils-dev"
 UTILS_append_dra7xx = " canutils-dev \
                         opencl-staticdev \
 "
+UTILS_append_k2hk-evm = " opencl-staticdev"
+UTILS_append_k2l-evm = " opencl-staticdev"
+UTILS_append_k2e-evm = " opencl-staticdev"
 UTILS_append_k2g-evm = " canutils-dev"
 
 EXTRA_LIBS = ""
@@ -129,6 +132,15 @@ EXTRA_LIBS_append_dra7xx = " libulm-dev \
                              libulm-staticdev \
                              gdbserver-c6x-dev \
 "
+EXTRA_LIBS_append_k2hk-evm = " libulm-staticdev \
+                               gdbserver-c6x-dev \
+"
+EXTRA_LIBS_append_k2l-evm = " libulm-staticdev \
+                              gdbserver-c6x-dev \
+"
+EXTRA_LIBS_append_k2e-evm = " libulm-staticdev \
+                              gdbserver-c6x-dev \
+"
 
 RDEPENDS_${PN} = "\
     ${UTILS} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 1fade5a..b34c6f4 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -62,6 +62,27 @@ UTILS_append_dra7xx = " canutils \
                         opencl-examples-dev \
 "
 
+UTILS_append_k2hk-evm = " \
+    opencl-staticdev \
+    opencl-examples-dev \
+    gdbc6x \
+    dsptop \
+"
+
+UTILS_append_k2l-evm = " \
+    opencl-staticdev \
+    opencl-examples-dev \
+    gdbc6x \
+    dsptop \
+"
+
+UTILS_append_k2e-evm = " \
+    opencl-staticdev \
+    opencl-examples-dev \
+    gdbc6x \
+    dsptop \
+"
+
 UTILS_append_k2g-evm = " canutils"
 
 EXTRA_LIBS = ""
-- 
1.9.1

[PATCH 4/6] ti-tisdk-makefile: Add OpenCL and related targets for keystone

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb        | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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 1988b8b..bccb22d 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
@@ -44,7 +44,7 @@ SRC_URI = "\
     file://Makefile_pru-icss \
 "
 
-PR = "r62"
+PR = "r63"
 
 MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
                         refresh-screen \
@@ -123,6 +123,21 @@ MAKEFILES_append_keystone = " u-boot-spl \
                               uio-module-drv \
 "
 
+MAKEFILES_append_k2hk-evm = " opencl-examples \
+                              gdbserverproxy-module-drv \
+                              debugss-module-drv \
+"
+
+MAKEFILES_append_k2l-evm = " opencl-examples \
+                             gdbserverproxy-module-drv \
+                             debugss-module-drv \
+"
+
+MAKEFILES_append_k2e-evm = " opencl-examples \
+                             gdbserverproxy-module-drv \
+                             debugss-module-drv \
+"
+
 # Use ARCH format expected by the makefile
 PLATFORM_ARCH = "armv7-a"
 PLATFORM_ARCH_omapl138 = "armv5te"
@@ -139,9 +154,11 @@ PVR_NULLDRM_omap-a15 = "0"
 
 PLATFORM_DEBUGSS = ""
 PLATFORM_DEBUGSS_dra7xx = "DRA7xx_PLATFORM"
+PLATFORM_DEBUGSS_keystone = "KEYSTONE_PLATFORM"
 
 PLATFORM_GDBSERVERPROXY = ""
 PLATFORM_GDBSERVERPROXY_dra7xx = "DRA7xx_PLATFORM"
+PLATFORM_GDBSERVERPROXY_keystone = "KEYSTONE_PLATFORM"
 
 PRU_ICSS_INSTALL_TARGET = "pru-icss_install_none"
 PRU_ICSS_INSTALL_TARGET_ti33x = "pru-icss_install_am335x"
-- 
1.9.1

[PATCH 5/6] packagegroup-arago-tisdk-matrix: Add OpenCL matrix demos for keystone

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index fde7c8f..52e006b 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to include Matrix v2"
 LICENSE = "MIT"
-PR = "r47"
+PR = "r48"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -162,6 +162,21 @@ MATRIX_APPS_append_keystone = " \
     matrix-gui-mc-demos	\
 "
 
+MATRIX_APPS_append_k2hk-evm = "      \
+    matrix-opencl-demo-floatcompute  \
+    matrix-opencl-demo-vecadd        \
+"
+
+MATRIX_APPS_append_k2l-evm = "       \
+    matrix-opencl-demo-floatcompute  \
+    matrix-opencl-demo-vecadd        \
+"
+
+MATRIX_APPS_append_k2e-evm = "       \
+    matrix-opencl-demo-floatcompute  \
+    matrix-opencl-demo-vecadd        \
+"
+
 RDEPENDS_${PN} = "        \
     ${MATRIX_ESSENTIALS}  \
     ${MATRIX_GUI}         \
-- 
1.9.1

[PATCH 6/6] tisdk-server-rootfs-image: Add unnecessary dev packages to BAD_RECOMMENDATIONS

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb | 7 +++++++
 1 file changed, 7 insertions(+)

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 3928948..89272f0 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
@@ -13,4 +13,11 @@ IMAGE_INSTALL += "\
     gdb \
 "
 
+BAD_RECOMMENDATIONS += " \
+    ti-llvm3.3-dev \
+    opencl-monitor-dev \
+    libulm-dev \
+    gdbserver-c6x-dev \
+"
+
 export IMAGE_BASENAME = "tisdk-server-rootfs-image"
-- 
1.9.1

Re: [PATCH 6/6] tisdk-server-rootfs-image: Add unnecessary dev packages to BAD_RECOMMENDATIONS

[Denys Dmytriyenko]

Can you please summarize why those packages get pulled in the first place?

On Wed, Jan 27, 2016 at 02:54:29PM -0500, Jacob Stiffler wrote:
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> 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 3928948..89272f0 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
> @@ -13,4 +13,11 @@ IMAGE_INSTALL += "\
>      gdb \
>  "
>  
> +BAD_RECOMMENDATIONS += " \
> +    ti-llvm3.3-dev \
> +    opencl-monitor-dev \
> +    libulm-dev \
> +    gdbserver-c6x-dev \
> +"
> +
>  export IMAGE_BASENAME = "tisdk-server-rootfs-image"
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 6/6] tisdk-server-rootfs-image: Add unnecessary dev packages to BAD_RECOMMENDATIONS

[Denys Dmytriyenko]

On Wed, Jan 27, 2016 at 03:13:38PM -0500, Denys Dmytriyenko wrote:
> Can you please summarize why those packages get pulled in the first place?
> 
> On Wed, Jan 27, 2016 at 02:54:29PM -0500, Jacob Stiffler wrote:
> > Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> > ---
> >  meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > 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 3928948..89272f0 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
> > @@ -13,4 +13,11 @@ IMAGE_INSTALL += "\
> >      gdb \
> >  "
> >  
> > +BAD_RECOMMENDATIONS += " \
> > +    ti-llvm3.3-dev \

Moreover, wasn't ti-llvm3.3-dev updated to ti-llvm3.6-dev by patch #1/6?


> > +    opencl-monitor-dev \
> > +    libulm-dev \
> > +    gdbserver-c6x-dev \
> > +"
> > +
> >  export IMAGE_BASENAME = "tisdk-server-rootfs-image"
> > -- 
> > 1.9.1
> > 
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 1/6] ti-llvm3.6: Upgrade ti-llvm from version 3.3 to 3.6

[Denys Dmytriyenko]

On Wed, Jan 27, 2016 at 02:54:24PM -0500, Jacob Stiffler wrote:
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  ...e-Do-not-check-build-executable-extension.patch | 25 +-----------
>  .../llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb}  | 47 ++++++++++++++++++----
>  2 files changed, 40 insertions(+), 32 deletions(-)
>  rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3 => ti-llvm3.6}/0001-configure-Do-not-check-build-executable-extension.patch (56%)
>  rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb} (67%)
> 
> diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
> similarity index 56%
> rename from meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch
> rename to meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
> index b6e5331..9a60caf 100644
> --- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch
> +++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
> @@ -9,8 +9,7 @@ Subject: [PATCH] configure: Do not check build executable extension.
>  Signed-off-by: Jake Stiffler <j-stiffler@ti.com>
>  ---
>   configure                 |    3 +++
> - projects/sample/configure |    4 ++++
> - 2 files changed, 7 insertions(+)
> + 1 files changed, 3 insertions(+)
>  
>  diff --git a/configure b/configure
>  index decbc40..387c4fd 100755
> @@ -33,28 +32,6 @@ index decbc40..387c4fd 100755
>     rm -f conftest*
>     test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank
>   fi
> -diff --git a/projects/sample/configure b/projects/sample/configure
> -index a2c70c6..b57f21c 100755
> ---- a/projects/sample/configure
> -+++ b/projects/sample/configure
> -@@ -4753,6 +4753,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
> -   rm -f conftest*
> -   echo 'int main () { return 0; }' > conftest.$ac_ext
> -   ac_cv_build_exeext=
> -+
> -+if false; then
> -   if { (eval echo "$as_me:$LINENO: \"$ac_build_link\"") >&5
> -   (eval $ac_build_link) 2>&5
> -   ac_status=$?
> -@@ -4769,6 +4771,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
> - echo "$as_me: error: installation or configuration problem: compiler cannot create executables." >&2;}
> -    { (exit 1); exit 1; }; }
> -   fi
> -+fi
> -+
> -   rm -f conftest*
> -   test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank
> - fi
>  -- 
>  1.7.9.5
>  
> diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
> similarity index 67%
> rename from meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb
> rename to meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
> index 35514c4..2c53f1f 100644
> --- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb
> +++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
> @@ -1,7 +1,7 @@
> -DESCRIPTION = "LLVM 3.3 with support for TI C66x intrinsics"
> +DESCRIPTION = "LLVM 3.6 with support for TI C66x intrinsics"
>  HOMEPAGE = "https://gitorious.design.ti.com/ocl/llvm33-src"
>  
> -PR = "r1"
> +PR = "r2"
>  
>  do_configure_prepend_class-native() {
>      # Fix paths in llvm-config
> @@ -10,27 +10,48 @@ do_configure_prepend_class-native() {
>  
>  require recipes-core/llvm/llvm.inc
>  
> -DEPENDS += "zlib libxml2"
> -EXTRA_OECONF += "--enable-zlib"
> +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
> +
> +DEPENDS += "libxml2"
> +EXTRA_OECONF += ""

^^^ Do you need to keep this, when it's empty?


>  LLVM_DIR = "ti-llvm${PV}"
>  
> -BRANCH = "master"
> +LLVM_GIT_NAME = "llvm"
> +LLVM_GIT_URI = "git://git.ti.com/opencl/llvm.git"
> +LLVM_GIT_PROTOCOL = "git"
> +LLVM_GIT_BRANCH = "release_36_ti"
> +LLVM_GIT_DESTSUFFIX = "git"
> +LLVM_GIT_SRCREV = "2ff2f1fe65645f9323372e382d0fd9647462abcb"
> +
> +CLANG_GIT_NAME = "clang"
> +CLANG_GIT_URI = "git://git.ti.com/opencl/clang.git"
> +CLANG_GIT_PROTOCOL = "git"
> +CLANG_GIT_BRANCH = "release_36_ti"
> +CLANG_GIT_DESTSUFFIX = "${LLVM_GIT_DESTSUFFIX}/tools/clang"
> +CLANG_GIT_SRCREV = "7b43bc10396ecdd141cec40acacbc240ac76a84f"
>  
>  SRC_URI = " \
> -  git://git.ti.com/opencl/ti-llvm-clang-3_3.git;protocol=git;branch=${BRANCH} \
> +  ${LLVM_GIT_URI};protocol=${LLVM_GIT_PROTOCOL};branch=${LLVM_GIT_BRANCH};destsuffix=${LLVM_GIT_DESTSUFFIX};name=${LLVM_GIT_NAME} \
> +  ${CLANG_GIT_URI};protocol=${CLANG_GIT_PROTOCOL};branch=${CLANG_GIT_BRANCH};destsuffix=${CLANG_GIT_DESTSUFFIX};name=${CLANG_GIT_NAME} \
>    file://0001-configure-Do-not-check-build-executable-extension.patch \
>  "
>  
> -
> -SRCREV = "29629a3e70d445cfbfbb4046a56d3648ebae9544"
> +SRCREV_${LLVM_GIT_NAME} = "${LLVM_GIT_SRCREV}"
> +SRCREV_${CLANG_GIT_NAME} = "${CLANG_GIT_SRCREV}"
>  
>  S = "${WORKDIR}/git"
>  
>  LIBXML2_INC = "`pkg-config libxml-2.0 --cflags`"
>  LIBXML2_LIBS = "`pkg-config libxml-2.0 --libs`"
>  
> +EXTRA_OECONF += " --enable-targets="host,arm,c6000,msp430" \
> +                  --disable-zlib \
> +                  --disable-terminfo \
> +                  --disable-libedit \
> +"
> +
>  EXTRA_OEMAKE += "LIBXML2_INC="${LIBXML2_INC}" LIBXML2_LIBS="${LIBXML2_LIBS}""
>  
>  do_compile_class-native() {
> @@ -54,6 +75,13 @@ do_compile_class-nativesdk() {
>          RANLIB="${BUILD_RANLIB}" \
>          PATH="${STAGING_BINDIR_NATIVE}:$PATH" \
>          cross-compile-build-tools
> +
> +    # Workaround for timestamp issue on built-tools
> +    for f in ${LLVM_BUILD_DIR}/BuildTools/Release/bin/*
> +    do
> +        touch $f
> +    done
> +
>      oe_runmake
>  }
>  
> @@ -95,6 +123,7 @@ do_install_class-native() {
>      install -m 0755 ${LLVM_INSTALL_DIR}/llvm-config${PV}-ti ${D}${bindir}
>  }
>  
> +
>  SYSROOT_PREPROCESS_FUNCS_class-target += "llvm_sysroot_preprocess_target"
>  SYSROOT_PREPROCESS_FUNCS_class-nativesdk += "llvm_sysroot_preprocess_target"
>  
> @@ -107,4 +136,6 @@ llvm_sysroot_preprocess_target() {
>      mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}-ti
>  }
>  
> +INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.0 += "dev-so"

Should there be .0 at the end of the package name?


> +
>  BBCLASSEXTEND = "native nativesdk"
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 1/6] ti-llvm3.6: Upgrade ti-llvm from version 3.3 to 3.6

[Jacob Stiffler]

On 1/27/2016 3:22 PM, Denys Dmytriyenko wrote:
> On Wed, Jan 27, 2016 at 02:54:24PM -0500, Jacob Stiffler wrote:
>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>> ---
>>   ...e-Do-not-check-build-executable-extension.patch | 25 +-----------
>>   .../llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb}  | 47 ++++++++++++++++++----
>>   2 files changed, 40 insertions(+), 32 deletions(-)
>>   rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3 => ti-llvm3.6}/0001-configure-Do-not-check-build-executable-extension.patch (56%)
>>   rename meta-arago-extras/recipes-core/llvm/{ti-llvm3.3_3.3.bb => ti-llvm3.6_3.6.bb} (67%)
>>
>> diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
>> similarity index 56%
>> rename from meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch
>> rename to meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
>> index b6e5331..9a60caf 100644
>> --- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3/0001-configure-Do-not-check-build-executable-extension.patch
>> +++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6/0001-configure-Do-not-check-build-executable-extension.patch
>> @@ -9,8 +9,7 @@ Subject: [PATCH] configure: Do not check build executable extension.
>>   Signed-off-by: Jake Stiffler <j-stiffler@ti.com>
>>   ---
>>    configure                 |    3 +++
>> - projects/sample/configure |    4 ++++
>> - 2 files changed, 7 insertions(+)
>> + 1 files changed, 3 insertions(+)
>>   
>>   diff --git a/configure b/configure
>>   index decbc40..387c4fd 100755
>> @@ -33,28 +32,6 @@ index decbc40..387c4fd 100755
>>      rm -f conftest*
>>      test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank
>>    fi
>> -diff --git a/projects/sample/configure b/projects/sample/configure
>> -index a2c70c6..b57f21c 100755
>> ---- a/projects/sample/configure
>> -+++ b/projects/sample/configure
>> -@@ -4753,6 +4753,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
>> -   rm -f conftest*
>> -   echo 'int main () { return 0; }' > conftest.$ac_ext
>> -   ac_cv_build_exeext=
>> -+
>> -+if false; then
>> -   if { (eval echo "$as_me:$LINENO: \"$ac_build_link\"") >&5
>> -   (eval $ac_build_link) 2>&5
>> -   ac_status=$?
>> -@@ -4769,6 +4771,8 @@ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
>> - echo "$as_me: error: installation or configuration problem: compiler cannot create executables." >&2;}
>> -    { (exit 1); exit 1; }; }
>> -   fi
>> -+fi
>> -+
>> -   rm -f conftest*
>> -   test x"${ac_cv_build_exeext}" = x && ac_cv_build_exeext=blank
>> - fi
>>   --
>>   1.7.9.5
>>   
>> diff --git a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
>> similarity index 67%
>> rename from meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb
>> rename to meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
>> index 35514c4..2c53f1f 100644
>> --- a/meta-arago-extras/recipes-core/llvm/ti-llvm3.3_3.3.bb
>> +++ b/meta-arago-extras/recipes-core/llvm/ti-llvm3.6_3.6.bb
>> @@ -1,7 +1,7 @@
>> -DESCRIPTION = "LLVM 3.3 with support for TI C66x intrinsics"
>> +DESCRIPTION = "LLVM 3.6 with support for TI C66x intrinsics"
>>   HOMEPAGE = "https://gitorious.design.ti.com/ocl/llvm33-src"
>>   
>> -PR = "r1"
>> +PR = "r2"
>>   
>>   do_configure_prepend_class-native() {
>>       # Fix paths in llvm-config
>> @@ -10,27 +10,48 @@ do_configure_prepend_class-native() {
>>   
>>   require recipes-core/llvm/llvm.inc
>>   
>> -DEPENDS += "zlib libxml2"
>> -EXTRA_OECONF += "--enable-zlib"
>> +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
>> +
>> +DEPENDS += "libxml2"
>> +EXTRA_OECONF += ""
> ^^^ Do you need to keep this, when it's empty?
>

This is not needed. I will remove this in the next version.

>>   LLVM_DIR = "ti-llvm${PV}"
>>   
>> -BRANCH = "master"
>> +LLVM_GIT_NAME = "llvm"
>> +LLVM_GIT_URI = "git://git.ti.com/opencl/llvm.git"
>> +LLVM_GIT_PROTOCOL = "git"
>> +LLVM_GIT_BRANCH = "release_36_ti"
>> +LLVM_GIT_DESTSUFFIX = "git"
>> +LLVM_GIT_SRCREV = "2ff2f1fe65645f9323372e382d0fd9647462abcb"
>> +
>> +CLANG_GIT_NAME = "clang"
>> +CLANG_GIT_URI = "git://git.ti.com/opencl/clang.git"
>> +CLANG_GIT_PROTOCOL = "git"
>> +CLANG_GIT_BRANCH = "release_36_ti"
>> +CLANG_GIT_DESTSUFFIX = "${LLVM_GIT_DESTSUFFIX}/tools/clang"
>> +CLANG_GIT_SRCREV = "7b43bc10396ecdd141cec40acacbc240ac76a84f"
>>   
>>   SRC_URI = " \
>> -  git://git.ti.com/opencl/ti-llvm-clang-3_3.git;protocol=git;branch=${BRANCH} \
>> +  ${LLVM_GIT_URI};protocol=${LLVM_GIT_PROTOCOL};branch=${LLVM_GIT_BRANCH};destsuffix=${LLVM_GIT_DESTSUFFIX};name=${LLVM_GIT_NAME} \
>> +  ${CLANG_GIT_URI};protocol=${CLANG_GIT_PROTOCOL};branch=${CLANG_GIT_BRANCH};destsuffix=${CLANG_GIT_DESTSUFFIX};name=${CLANG_GIT_NAME} \
>>     file://0001-configure-Do-not-check-build-executable-extension.patch \
>>   "
>>   
>> -
>> -SRCREV = "29629a3e70d445cfbfbb4046a56d3648ebae9544"
>> +SRCREV_${LLVM_GIT_NAME} = "${LLVM_GIT_SRCREV}"
>> +SRCREV_${CLANG_GIT_NAME} = "${CLANG_GIT_SRCREV}"
>>   
>>   S = "${WORKDIR}/git"
>>   
>>   LIBXML2_INC = "`pkg-config libxml-2.0 --cflags`"
>>   LIBXML2_LIBS = "`pkg-config libxml-2.0 --libs`"
>>   
>> +EXTRA_OECONF += " --enable-targets="host,arm,c6000,msp430" \
>> +                  --disable-zlib \
>> +                  --disable-terminfo \
>> +                  --disable-libedit \
>> +"
>> +
>>   EXTRA_OEMAKE += "LIBXML2_INC="${LIBXML2_INC}" LIBXML2_LIBS="${LIBXML2_LIBS}""
>>   
>>   do_compile_class-native() {
>> @@ -54,6 +75,13 @@ do_compile_class-nativesdk() {
>>           RANLIB="${BUILD_RANLIB}" \
>>           PATH="${STAGING_BINDIR_NATIVE}:$PATH" \
>>           cross-compile-build-tools
>> +
>> +    # Workaround for timestamp issue on built-tools
>> +    for f in ${LLVM_BUILD_DIR}/BuildTools/Release/bin/*
>> +    do
>> +        touch $f
>> +    done
>> +
>>       oe_runmake
>>   }
>>   
>> @@ -95,6 +123,7 @@ do_install_class-native() {
>>       install -m 0755 ${LLVM_INSTALL_DIR}/llvm-config${PV}-ti ${D}${bindir}
>>   }
>>   
>> +
>>   SYSROOT_PREPROCESS_FUNCS_class-target += "llvm_sysroot_preprocess_target"
>>   SYSROOT_PREPROCESS_FUNCS_class-nativesdk += "llvm_sysroot_preprocess_target"
>>   
>> @@ -107,4 +136,6 @@ llvm_sysroot_preprocess_target() {
>>       mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}-ti
>>   }
>>   
>> +INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.0 += "dev-so"
> Should there be .0 at the end of the package name?
>

This ".0" is intentional.

The previous version (3.3) consistently used 2 digit versions in the 
library name. This new version (3.6) now appends a 3rd digit to some of 
the library names,

>> +
>>   BBCLASSEXTEND = "native nativesdk"
>> -- 
>> 1.9.1
>>
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago