cudatoolkit6.5 opencv4tegra: really update to l4t r21.5

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>

4 files changed, 86 insertions, 38 deletions

diff --git a/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.4.0.bbappend b/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.4.0.bbappend
deleted file mode 100644
index bdd2840..0000000
--- a/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.4.0.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-DEPENDS = "dpkg-native"
-
-INSANE_SKIP_${PN} += "already-stripped libdir"
-
-python do_unpack () {
-    locals = d.getVar('WORKDIR', True)
-    s = d.getVar('S', True)
-    d.setVar('WORKDIR', s)
-    d.setVar('S', s)
-    bb.build.exec_func('base_do_unpack', d)
-    d.setVar('WORKDIR', locals)
-}
diff --git a/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb b/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb
new file mode 100644
index 0000000..6bb8657
--- /dev/null
+++ b/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "NVIDIA CUDA 6.5 Toolkit for L4T Rel 21.x Packages"
+HOMEPAGE = "https://developer.nvidia.com/"
+LICENSE = "Proprietary"
+
+SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/005/linux-x64/cuda-repo-l4t-r21.5-6-5-local_6.5-53_armhf.deb"
+
+LIC_FILES_CHKSUM = "file://usr/share/doc/cuda-repo-l4t-r21.5-6-5-local/copyright;md5=f87877410d6936081b0b8ddd124ca96d"
+
+SRC_URI[md5sum] = "93b5c6592292565c389c46a16b4cbf5d"
+SRC_URI[sha256sum] = "4739c63e16b9a169f988c2b8f175c0182fa118833b49950fe72fe8c039ba1359"
+
+DEPENDS = "dpkg-native"
+
+INSANE_SKIP_${PN} = "ldflags"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/cuda6.5"
+
+INSANE_SKIP_${PN}-dev = "ldflags"
+
+FILES_${PN} = "${datadir}/lintian/* \
+               ${base_prefix}/usr/local/cuda-6.5/* "
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+INSANE_SKIP_${PN} += "already-stripped dev-so libdir"
+
+python do_unpack () {
+    locals = d.getVar('WORKDIR', True)
+    s = d.getVar('S', True)
+    d.setVar('WORKDIR', s)
+    d.setVar('S', s)
+    bb.build.exec_func('base_do_unpack', d)
+    d.setVar('WORKDIR', locals)
+}
+
+do_install () {
+    cp -r ${WORKDIR}/cuda6.5/usr ${D}
+    dpkg -x ${WORKDIR}/cuda6.5/var/cuda-repo-6-5-local/cuda-cudart-6-5_6.5-53_armhf.deb ${D}
+}
diff --git a/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.4.0.bbappend b/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.4.0.bbappend
deleted file mode 100644
index d705a8c..0000000
--- a/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.4.0.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-DEPENDS = "dpkg-native tiff zlib jpeg glib-2.0 python gtk+ libpng12 jasper libav cudatoolkit6.5"
-
-SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r23_Release_v1.0/libopencv4tegra-repo_2.4.12.3_armhf_l4t-r23.deb"
-
-LIC_FILES_CHKSUM = "file://usr/share/doc/libopencv4tegra-repo/copyright;md5=99d8c0c1313afdf990f6407c07a88407"
-
-SRC_URI[md5sum] = "ee3ad8fb8eaafc357d5e228d61ad7123"
-SRC_URI[sha256sum] = "096fb80a83c53f5e946c8106985eb147c8791b0cbe1e1fc38ebc49a3b932bf19"
-
-INSANE_SKIP_${PN} += "already-stripped"
-
-python do_unpack () {
-    locals = d.getVar('WORKDIR', True)
-    s = d.getVar('S', True)
-    d.setVar('WORKDIR', s)
-    d.setVar('S', s)
-    bb.build.exec_func('base_do_unpack', d)
-    d.setVar('WORKDIR', locals)
-}
-
-do_install () {
-    cp -r ${WORKDIR}/opencv4tegra/usr ${D}
-    dpkg -x ${WORKDIR}/opencv4tegra/var/opencv4tegra-repo/libopencv4tegra_2.4.12.3_armhf.deb ${D}
-    dpkg -x ${WORKDIR}/opencv4tegra/var/opencv4tegra-repo/libopencv4tegra-dev_2.4.12.3_armhf.deb ${D}
-    dpkg -x ${WORKDIR}/opencv4tegra/var/opencv4tegra-repo/libopencv4tegra-python_2.4.12.3_armhf.deb ${D}
-}
diff --git a/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb b/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb
new file mode 100644
index 0000000..b12c501
--- /dev/null
+++ b/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "NVIDIA OpenCV4Tegra for L4T 21.x Packages"
+HOMEPAGE = "https://developer.nvidia.com/"
+LICENSE = "Proprietary"
+
+SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/003/linux-x64/libopencv4tegra-repo_2.4.13_armhf_l4t-r21.deb"
+
+LIC_FILES_CHKSUM = "file://usr/share/doc/libopencv4tegra-repo/copyright;md5=99d8c0c1313afdf990f6407c07a88407"
+
+SRC_URI[md5sum] = "0db305a4d24a9211606bb1fb8ec2d480"
+SRC_URI[sha256sum] = "9bfa9d5df0c3218f5b4000c8d9d50d136cd8e6ad82384b7781719deb7093ae21"
+
+DEPENDS = "dpkg-native tiff zlib jpeg glib-2.0 python gtk+ libpng12 jasper libav cudatoolkit6.5"
+
+INSANE_SKIP_${PN} = "ldflags"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/opencv4tegra"
+
+INSANE_SKIP_${PN}-dev = "ldflags"
+
+FILES_${PN} = "${bindir}/* \
+               ${datadir}/OpenCV/* \
+               ${datadir}/lintian/* \
+               ${libdir}/*"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+INSANE_SKIP_${PN} += "already-stripped dev-so"
+
+python do_unpack () {
+    locals = d.getVar('WORKDIR', True)
+    s = d.getVar('S', True)
+    d.setVar('WORKDIR', s)
+    d.setVar('S', s)
+    bb.build.exec_func('base_do_unpack', d)
+    d.setVar('WORKDIR', locals)
+}
+
+do_install () {
+    cp -r ${WORKDIR}/opencv4tegra/usr ${D}
+    dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra_2.4.13_armhf.deb ${D}
+    dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-dev_2.4.13_armhf.deb ${D}
+    dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-python_2.4.13_armhf.deb ${D}
+}