From 97b200558fa136e71cc518875d63c26de586aa56 Mon Sep 17 00:00:00 2001 From: Ilies CHERGUI Date: Mon, 8 Nov 2021 22:44:14 +0000 Subject: [PATCH] deepstream: update to 6.0 from JetPack 4.6 (rev 2) Signed-off-by: Ilies CHERGUI --- ...1_5.1.0-1.bb => deepstream-6.0_6.0.0-1.bb} | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) rename recipes-devtools/deepstream/{deepstream-5.1_5.1.0-1.bb => deepstream-6.0_6.0.0-1.bb} (80%) diff --git a/recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb b/recipes-devtools/deepstream/deepstream-6.0_6.0.0-1.bb similarity index 80% rename from recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb rename to recipes-devtools/deepstream/deepstream-6.0_6.0.0-1.bb index 32537cf156f52..e3ce3e5e8bd55 100644 --- a/recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb +++ b/recipes-devtools/deepstream/deepstream-6.0_6.0.0-1.bb @@ -1,16 +1,17 @@ DESCRIPTION = "NVIDIA Deepstream SDK" +HOMEPAGE = "https://developer.nvidia.com/deepstream-sdk" LICENSE = "Proprietary" LIC_FILES_CHKSUM = " \ - file://usr/share/doc/deepstream-5.1/copyright;md5=51be1eeb26038570c51ffe07b0097891 \ - file://opt/nvidia/deepstream/deepstream-5.1/LICENSE.txt;md5=433007b08df9ec24f46deff7572d671c \ - file://opt/nvidia/deepstream/deepstream-5.1/doc/nvidia-tegra/LICENSE.iothub_client;md5=4f8c6347a759d246b5f96281726b8611 \ - file://opt/nvidia/deepstream/deepstream-5.1/doc/nvidia-tegra/LICENSE.nvds_amqp_protocol_adaptor;md5=8b4b651fa4090272b2e08e208140a658" -HOMEPAGE = "https://developer.nvidia.com/deepstream-sdk" + file://usr/share/doc/deepstream-6.0/copyright;md5=7a5ffdb833cdefe5ac34aaa81de173a3 \ + file://opt/nvidia/deepstream/deepstream-6.0/LICENSE.txt;md5=5dcf86799aa20202668e226e93f9cfd9 \ + file://opt/nvidia/deepstream/deepstream-6.0/doc/nvidia-tegra/LICENSE.iothub_client;md5=4f8c6347a759d246b5f96281726b8611 \ + file://opt/nvidia/deepstream/deepstream-6.0/doc/nvidia-tegra/LICENSE.nvds_amqp_protocol_adaptor;md5=8b4b651fa4090272b2e08e208140a658 \ +" inherit l4t_deb_pkgfeed SRC_COMMON_DEBS = "${BPN}_${PV}_arm64.deb;subdir=${BPN}" -SRC_URI[sha256sum] = "68b5ddff8b8682ed657fe8554cfb492f36621274a7593d9660f335ce8ba926a5" +SRC_URI[sha256sum] = "320927fe83b40bea2da5408f6777985065038c7f1506b2f5d5eaa0bcfc2a1564" COMPATIBLE_MACHINE = "(tegra)" PACKAGE_ARCH = "${TEGRA_PKGARCH}" @@ -26,7 +27,7 @@ DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-rtsp-ser S = "${WORKDIR}/${BPN}" B = "${WORKDIR}/build" -DEEPSTREAM_PATH = "/opt/nvidia/deepstream/deepstream-5.1" +DEEPSTREAM_PATH = "/opt/nvidia/deepstream/deepstream-6.0" SYSROOT_DIRS += "${DEEPSTREAM_PATH}/lib/" do_configure() { @@ -47,14 +48,6 @@ do_install() { install -m 0644 "$f" ${D}${DEEPSTREAM_PATH}/lib/ done ln -sf libnvds_msgconv.so.1.0.0 ${D}${DEEPSTREAM_PATH}/lib/libnvds_msgconv.so - # Requires Python 3.6 - rm -f ${D}${DEEPSTREAM_PATH}/lib/pyds.so - - for i in 1 2; do - path="${DEEPSTREAM_PATH}/lib/triton_backends/tensorflow$i" - install -d ${D}$path - cp --preserve=mode,timestamps,links --no-dereference ${S}$path/* ${D}$path/ - done install -d ${D}/${sysconfdir}/ld.so.conf.d/ echo "${DEEPSTREAM_PATH}/lib" > ${D}/${sysconfdir}/ld.so.conf.d/deepstream.conf @@ -82,7 +75,7 @@ def pkgconf_packages(d): PKGCONF_PACKAGES = "${@pkgconf_packages(d)}" -PACKAGES =+ "${PN}-samples-data ${PN}-samples ${PN}-sources ${PN}-iothub-client ${PN}-azure-edge ${PN}-triton-plugins ${PKGCONF_PACKAGES}" +PACKAGES =+ "${PN}-samples-data ${PN}-samples ${PN}-sources ${PN}-iothub-client ${PN}-triton-plugins ${PKGCONF_PACKAGES}" FILES:${PN} = "${sysconfdir}/ld.so.conf.d/ \ ${libdir}/gstreamer-1.0/deepstream \ @@ -104,7 +97,6 @@ FILES:${PN}-samples-data = "\ FILES:${PN}-sources = "${DEEPSTREAM_PATH}/sources" FILES:${PN}-iothub-client = "${DEEPSTREAM_PATH}/lib/libiothub_client.so" -FILES:${PN}-azure-edge = "${DEEPSTREAM_PATH}/lib/libazure*" FILES:${PN}-triton-plugins = "${DEEPSTREAM_PATH}/lib/triton_backends" FILES:${PN}-amqp = "${DEEPSTREAM_PATH}/lib/libnvds_amqp*" FILES:${PN}-kafka = "${DEEPSTREAM_PATH}/lib/libnvds_kafka*"