[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#992374: marked as done (buster-pu: package nvidia-cuda-toolkit/9.2.148-7+deb10u1)

Your message dated Sat, 09 Oct 2021 12:11:43 +0100
with message-id <896b7609401ceb0e1c537222e26587ea2351415d.camel@adam-barratt.org.uk>
and subject line Closing bugs for fixes included in the 10.11 point release
has caused the Debian Bug report #992374,
regarding buster-pu: package nvidia-cuda-toolkit/9.2.148-7+deb10u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
992374: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992374
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

The ppc64el nvidia-cuda-toolkit package in buster does not ship the
customized nvcc.profile configuration file but the unmodified upstream
one which does not work with the FHS layout used by the Debian
packaging. #991592
Since some people actually use the ppc64el stable packages in production
environments, I'd like to fix that.

This problem is specific to the version in buster/ppc64el:
- newer releases (10+) don't provide incremental patch releases, they
  just release the full toolkit more frequently
- in newer (10+) toolkit releases, ppc64el has a .run installer like
  amd64, no more repacking of upstream .deb files needed

There is also some replacement of $< in debian/rules with the intended
value, since $< does not work for order-only prerequisites. (This only
affects verbose output, which contained a lot of incorrect noise.)

Andreas

diff --git a/debian/changelog b/debian/changelog
index cba0bf5..0bfbae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nvidia-cuda-toolkit (9.2.148-7+deb10u1) buster; urgency=medium
+
+  * [ppc64el]: Do not overwrite the customized nvcc.profile with the
+    unmodified upstream copy from CUDA 9.2 Patch 1.  (Closes: #991592)
+
+ -- Andreas Beckmann <anbe@debian.org>  Tue, 17 Aug 2021 18:57:22 +0200
+
 nvidia-cuda-toolkit (9.2.148-7) unstable; urgency=medium
 
   * Use debianize.patch to customize paths etc. in nvcc.profile and the
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 92b4ec0..db5c248 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -7,4 +7,4 @@ pristine-tar = False
 compression = gz
 tarball-dir = ../tarballs-nvidia-cuda-toolkit/%(version)s
 component = [ 'ppc64el', 'amd64-patch1', 'ppc64el-patch1', ]
-debian-branch = master
+debian-branch = buster
diff --git a/debian/rules b/debian/rules
index 7d28500..08ce2b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ nvidia-cuda-amd64-patch1: | nvidia-cuda-amd64
 	$(RM) -v $@.tmp/install_patch.pl
 	$(RM) -v $@.tmp/payload/install_manifest
 	mv $@.tmp $@
-	for f in $$(cd $@ && find . ! -type d) ; do test -e $</$$f || echo "new file in $@: $$f" ; done
+	for f in $$(cd $@ && find . ! -type d) ; do test -e nvidia-cuda-amd64/$$f || echo "new file in $@: $$f" ; done
 
 nvidia-cuda-ppc64el:
 	dh_testdir
@@ -96,11 +96,12 @@ nvidia-cuda-ppc64el-patch1: | nvidia-cuda-ppc64el
 	$(RM) -r $@.tmp/ubuntutree/usr/share/doc
 	$(RM) -r $@.tmp/ubuntutree/usr/share/lintian
 	$(RM) -v $@.tmp/ubuntutree/etc/ld.so.conf.d/cuda-$(subst .,-,$(CUDA_SOVERSION)).conf
+	cmp -s nvidia-cuda-ppc64el/bin/nvcc.profile $@.tmp/bin/nvcc.profile && $(RM) -v $@.tmp/bin/nvcc.profile
 	$(RM) $@.tmp/include $@.tmp/lib64
 	mv $@.tmp/targets/ppc64le-linux/include $@.tmp/include
 	mv $@.tmp/targets/ppc64le-linux/lib $@.tmp/lib64
 	mv $@.tmp $@
-	for f in $$(cd $@ && find . ! -type d) ; do test -e $</$$f || echo "new file in $@: $$f" ; done
+	for f in $$(cd $@ && find . ! -type d) ; do test -e nvidia-cuda-ppc64el/$$f || echo "new file in $@: $$f" ; done
 
 unpack-stamp: $(filter debian/patches%,$(AUTOGEN))
 unpack-stamp: nvidia-cuda-$(DEB_HOST_ARCH)

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 10.11

Hi,

The updates relating to these bugs were included in this morning's
10.11 point release for buster.

Regards,

Adam

--- End Message ---
Reply to: