From 595713ea8e20bb44ed09726f40cc1f26cd55b5f9 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Sat, 17 Aug 2019 07:37:14 -0700 Subject: [PATCH] cuda-*-native: provide for ubuntu1604 version of tools Create separate recipes for the ubuntu1804 and ubuntu1604 versions of the CUDA 10 native tools, and add a variable CUDA_BINARIES_NATIVE to allow users to override the default selection of the ubuntu1804 package. Signed-off-by: Matt Madison --- ... cuda-binaries-ubuntu1604-native_10.0.326-1.bb} | 0 .../cuda-binaries-ubuntu1804-native_10.0.326-1.bb | 14 ++++++++++++++ .../cuda-shared-binaries-native-10.0.326-1.inc | 4 ++-- .../cuda/cuda-tools-native_10.0.326-1.bb | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) rename recipes-devtools/cuda/{cuda-binaries-native_10.0.326-1.bb => cuda-binaries-ubuntu1604-native_10.0.326-1.bb} (100%) create mode 100644 recipes-devtools/cuda/cuda-binaries-ubuntu1804-native_10.0.326-1.bb diff --git a/recipes-devtools/cuda/cuda-binaries-native_10.0.326-1.bb b/recipes-devtools/cuda/cuda-binaries-ubuntu1604-native_10.0.326-1.bb similarity index 100% rename from recipes-devtools/cuda/cuda-binaries-native_10.0.326-1.bb rename to recipes-devtools/cuda/cuda-binaries-ubuntu1604-native_10.0.326-1.bb diff --git a/recipes-devtools/cuda/cuda-binaries-ubuntu1804-native_10.0.326-1.bb b/recipes-devtools/cuda/cuda-binaries-ubuntu1804-native_10.0.326-1.bb new file mode 100644 index 00000000..751caefe --- /dev/null +++ b/recipes-devtools/cuda/cuda-binaries-ubuntu1804-native_10.0.326-1.bb @@ -0,0 +1,14 @@ +CUDA_REPO_EXTRA = "-10.0.326-410.108" + +require cuda-binaries-native-common.inc + +inherit nvidia_devnet_downloads + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://usr/local/cuda-10.0/LICENSE;md5=dfb2d23fe5070ac47b201fbf1e497891 \ + file://usr/local/cuda-10.0/doc/EULA.txt;md5=049f8f2a31b8c3cc436cc63f0a72c9c9" + +SRC_URI = "${NVIDIA_DEVNET_MIRROR}/cuda-repo-ubuntu1804-10-0-local-10.0.326-410.108_1.0-1_amd64.deb" +SRC_URI[md5sum] = "0396239108d46ab682fb90468ea937b6" +SRC_URI[sha256sum] = "94ae0add742224198eaa059353fc218ba3e90fe008bafa01e00f547600c3afdf" +do_unpack[depends] += "xz-native:do_populate_sysroot" diff --git a/recipes-devtools/cuda/cuda-shared-binaries-native-10.0.326-1.inc b/recipes-devtools/cuda/cuda-shared-binaries-native-10.0.326-1.inc index 94380697..9eac345b 100644 --- a/recipes-devtools/cuda/cuda-shared-binaries-native-10.0.326-1.inc +++ b/recipes-devtools/cuda/cuda-shared-binaries-native-10.0.326-1.inc @@ -9,8 +9,8 @@ SRC_URI = "" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://usr/local/cuda-10.0/LICENSE;md5=dfb2d23fe5070ac47b201fbf1e497891 \ file://usr/local/cuda-10.0/doc/EULA.txt;md5=049f8f2a31b8c3cc436cc63f0a72c9c9" -do_configure[depends] += "cuda-binaries-native:do_preconfigure dpkg-native:do_populate_sysroot" -do_populate_lic[depends] += "cuda-binaries-native:do_preconfigure" +do_configure[depends] += "${CUDA_BINARIES_NATIVE}:do_preconfigure dpkg-native:do_populate_sysroot" +do_populate_lic[depends] += "${CUDA_BINARIES_NATIVE}:do_preconfigure" S = "${TMPDIR}/work-shared/cuda-binaries-native-${PV}-${PR}" B = "${WORKDIR}/build" diff --git a/recipes-devtools/cuda/cuda-tools-native_10.0.326-1.bb b/recipes-devtools/cuda/cuda-tools-native_10.0.326-1.bb index 37a985bc..f236fb53 100644 --- a/recipes-devtools/cuda/cuda-tools-native_10.0.326-1.bb +++ b/recipes-devtools/cuda/cuda-tools-native_10.0.326-1.bb @@ -1,3 +1,4 @@ +CUDA_BINARIES_NATIVE ??= "cuda-binaries-ubuntu1804-native" require cuda-shared-binaries-native-${PV}.inc CUDA_PKGS = " \