Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / 
cuda


Commits:
5becc6f4 by Sven-Hendrik Haase at 2024-10-21T01:40:51+02:00
upgpkg: 12.6.2-2

- Add .desktop files
- Simplify PKGBUILD

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = cuda
        pkgdesc = NVIDIA's GPU programming toolkit
        pkgver = 12.6.2
-       pkgrel = 1
+       pkgrel = 2
        url = https://developer.nvidia.com/cuda-zone
        install = cuda.install
        arch = x86_64
@@ -43,6 +43,9 @@ pkgbase = cuda
        source = nvjpeg.pc
        source = nvrtc.pc
        source = nvToolsExt.pc
+       source = nsight-compute.desktop
+       source = nsight-systems.desktop
+       source = nvvp.desktop
        sha512sums = 
b43be2aadc3b261a9758d303d893c7a31bfb353dcfda1adbef1dcc4eb3e7a52dc2ebfb0f30e68c1a08fec68f843e49540ab838436447fb70f9d1b2f2d7246dd4
        sha512sums = 
3cac229e13762e09032c60b10c01d1af8da15871ec7ef76606fc69780c5d5e0410bf65c6b94230787fd9bb18c9d92083b3f65da36db97bbc8edb7a027c45a5be
        sha512sums = 
714d973bc79446f73bebe85306b3566fe25b554bcbcba2fcbe76709a3eca71fb5d183ab4da2d3b5e9326cb9cd8d13a93f6d4a005ea5a41f7ef8e6c6e81e06b5e
@@ -74,6 +77,9 @@ pkgbase = cuda
        sha512sums = 
ede3cfcaaa655e73e47bd3475d94d33933c6e7c89c7dc7c98d9491e066ab4cf504e12ed4f1eab9edaeb358154bd86a43d359304675efa4fd4a67d01c97986f3b
        sha512sums = 
4405d88a132f3cf4e6c506962860503537a3c946fbd5f1c29c52bb6e6b45b13d14333bc772c62589337875200b23b0af17c9e5ce188d2f4018f488ea75501054
        sha512sums = 
16003e7e6307d39a95fe246a7d079e9a3d827bd03fd5f03bdd2051a5033a1f93d9c8531073ef587808a9d0c75d20e3d79417a90b14102bc872d32c2c7a5ebdcb
+       sha512sums = 
78109166c44bd9d84399f97805b2d7b3dc2dffd5730f2f7c5dde1c07c4e90e3a5af14ff2b46f4b90b8b8390f72ca509526e38042ecfb57f50bb69ccb1f34db15
+       sha512sums = 
1f3edd63bc8d252f2818204657da9bcf9c78ec009d4b4e2addbad83e619c1ebaad9c28c0e592974d29e1ce1c29588ff9100a0970febe789cdea7316d16884cce
+       sha512sums = 
0fdd26868445946d5a3a64fd1a9a996dab6e85ee07b08e7c64a66a5db194653b98817bee876838c792cf57fcd4747173f1b1e77b083a9bbbb68932c0aa95185a
 
 pkgname = cuda
        optdepends = gdb: for cuda-gdb


=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@ pkgver=12.6.2
 # Before upgrading, make sure that we ship at least this version of
 # nvidia-utils as otherwise we'll get stuff such as #7.
 _driverver=560.35.03
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA's GPU programming toolkit"
 arch=('x86_64')
 url="https://developer.nvidia.com/cuda-zone";
@@ -113,22 +113,6 @@ build() {
   # Delete some unnecessary files
   rm -r "${_prepdir}"/opt/cuda/bin/cuda-uninstaller
 
-  # Install profile and ld.so.config files
-  install -Dm644 "${srcdir}/cuda.sh" "${_prepdir}/etc/profile.d/cuda.sh"
-  install -Dm644 "${srcdir}/cuda.conf" "${_prepdir}/etc/ld.so.conf.d/cuda.conf"
-
-  # Install pkgconfig files
-  mkdir -p "$_prepdir"/usr/lib/pkgconfig
-  cp "${srcdir}"/*.pc "${_prepdir}"/usr/lib/pkgconfig
-
-  # Install desktop entries
-  mkdir -p "$_prepdir"/usr/share/applications
-  cp "${srcdir}"/*.desktop "${_prepdir}"/usr/share/applications
-
-  mkdir -p "${_prepdir}/usr/share/licenses/${pkgname}"
-  ln -s /opt/cuda/EULA.txt "${_prepdir}/usr/share/licenses/${pkgname}/EULA.txt"
-  ln -s /opt/cuda/README "${_prepdir}/usr/share/licenses/${pkgname}/README"
-
   # Add a symlink lib->lib64 as some libraries might expect that (FS#76951)
   ln -s lib64 "${_prepdir}/opt/cuda/lib"
 
@@ -162,8 +146,19 @@ package_cuda() {
   rm "${pkgdir}"/opt/cuda/include/include
   rm "${pkgdir}"/opt/cuda/lib64/lib64
 
+  # Install pkgconfig files
+  install -Dt "${pkgdir}"/usr/lib/pkgconfig "${srcdir}"/*.pc
+
+  # Install profile and ld.so.config files
+  install -Dm644 "${srcdir}/cuda.sh" "${pkgdir}/etc/profile.d/cuda.sh"
+  install -Dm644 "${srcdir}/cuda.conf" "${pkgdir}/etc/ld.so.conf.d/cuda.conf"
+
   rm -r "${pkgdir}"/opt/cuda/{bin/nvvp,bin/computeprof,libnvvp,nsight*}
-  rm -r "${pkgdir}"/usr/share/applications
+
+  # Licenses
+  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s /opt/cuda/EULA.txt "${pkgdir}/usr/share/licenses/${pkgname}/EULA.txt"
+  ln -s /opt/cuda/README "${pkgdir}/usr/share/licenses/${pkgname}/README"
 }
 
 package_cuda-tools() {
@@ -179,11 +174,10 @@ package_cuda-tools() {
   mv "${_prepdir}"/opt/cuda/bin/computeprof 
"${pkgdir}/opt/cuda/bin/computeprof"
   mv "${_prepdir}"/opt/cuda/libnvvp "${pkgdir}/opt/cuda"
 
-  # desktop entries
-  mkdir -p "${pkgdir}/usr/share/applications"
-  mv "${_prepdir}"/usr/share/applications "${pkgdir}/usr/share"
+  # Install desktop entries
+  install -Dt "${pkgdir}"/usr/share/applications "${srcdir}"/*.desktop
 
-  # licenses
+  # Licenses
   mkdir -p "${pkgdir}/usr/share/licenses"
   ln -s /usr/share/licenses/cuda "${pkgdir}/usr/share/licenses/${pkgname}"
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cuda/-/commit/5becc6f4afee10f41ed04fe0bf418c304e2a0c36

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cuda/-/commit/5becc6f4afee10f41ed04fe0bf418c304e2a0c36
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to