[PATCH 1/2] ocl: Bump version to 1.1.6

[PATCH 1/2] ocl: Bump version to 1.1.6

[Jacob Stiffler]

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-ti/ocl/ocl.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
index 3195d5b..adf65e0 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.4"
+PV = "1.1.6"
 INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
@@ -7,4 +7,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/ocl:"
 
 BRANCH = "master"
 SRC_URI = "git://git.ti.com/opencl/ti-opencl.git;protocol=git;branch=${BRANCH}"
-SRCREV = "a675f28647b294d0fc5d5234dd8bcf89a330a0e5"
+SRCREV = "992dfba8783af895f6d4e4877ad7c0466d085bf0"
-- 
1.9.1

[PATCH 2/2] opencl-monitor: Move firmware to allow for other firmwares

[Jacob Stiffler]

* Add symlink to make opencl-monitor firmware the default.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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 336d068..9ff4b5b 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 include ocl.inc
 require recipes-ti/includes/ti-paths.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 inherit cmake
 
@@ -47,6 +47,20 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x"
 export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr"
 export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages"
 
+do_install_append() {
+    mv ${D}/lib/firmware/dra7-dsp1-fw.xe66 \
+       ${D}/lib/firmware/dra7-dsp1-fw.xe66.ocl
+
+    mv ${D}/lib/firmware/dra7-dsp2-fw.xe66 \
+       ${D}/lib/firmware/dra7-dsp2-fw.xe66.ocl
+
+    ln -s dra7-dsp1-fw.xe66.ocl \
+          ${D}/lib/firmware/dra7-dsp1-fw.xe66
+
+    ln -s dra7-dsp2-fw.xe66.ocl \
+          ${D}/lib/firmware/dra7-dsp2-fw.xe66
+}
+
 MONITOR_FIRMWARE = ""
 MONITOR_FIRMWARE_dra7xx = "${base_libdir}/firmware/*"
 
-- 
1.9.1

Re: [PATCH 2/2] opencl-monitor: Move firmware to allow for other firmwares

[Denys Dmytriyenko]

Can update-alternatives help here?


On Fri, Oct 09, 2015 at 10:43:03AM -0400, Jacob Stiffler wrote:
> * Add symlink to make opencl-monitor firmware the default.
> 
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> 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 336d068..9ff4b5b 100644
> --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> @@ -5,7 +5,7 @@ LICENSE = "BSD"
>  include ocl.inc
>  require recipes-ti/includes/ti-paths.inc
>  
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  
>  inherit cmake
>  
> @@ -47,6 +47,20 @@ export GDB_SERVER_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/gdbc6x"
>  export X86_LLVM_DIR = "${STAGING_DIR_NATIVE}/usr"
>  export XDCPATH = "${S};${IPC_DIR}/packages;${BIOS_DIR}/packages;${EDMA3LLD_DIR}/packages;${FC_DIR}/packages;${XDAIS_DIR}/packages"
>  
> +do_install_append() {
> +    mv ${D}/lib/firmware/dra7-dsp1-fw.xe66 \
> +       ${D}/lib/firmware/dra7-dsp1-fw.xe66.ocl
> +
> +    mv ${D}/lib/firmware/dra7-dsp2-fw.xe66 \
> +       ${D}/lib/firmware/dra7-dsp2-fw.xe66.ocl
> +
> +    ln -s dra7-dsp1-fw.xe66.ocl \
> +          ${D}/lib/firmware/dra7-dsp1-fw.xe66
> +
> +    ln -s dra7-dsp2-fw.xe66.ocl \
> +          ${D}/lib/firmware/dra7-dsp2-fw.xe66
> +}
> +
>  MONITOR_FIRMWARE = ""
>  MONITOR_FIRMWARE_dra7xx = "${base_libdir}/firmware/*"
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago