Bug#1011365: bullseye-pu: package nvidia-cuda-toolkit/11.2.2-3+deb11u2
On Mon, 2022-05-30 at 17:31 +0200, Andreas Beckmann wrote: > On 29/05/2022 16.16, Adam D. Barratt wrote: > > Unfortunately the amd64 upload got rejected: > > > > Version check failed: > > Your upload included the binary package nvidia-openjdk-8-jre, > > version > > 9.+8u332-ga-1~deb9u1~11.2.2-3+deb11u2, for amd64, > > however experimental already has version 9.+8u332-ga-1~11.5.1-2. > > Uploads to proposed-updates must have a lower version than present > > in > > experimental. > > Oh yes. 1~d < 1 > 1~d~1 > 1~1 > > Is there a similar constraint for sid as well? I would have expected > that to trigger first ... and probably s/already/only/ ... > Surprisingly not. I have a feeling there once was, but it was removed. I'm not entirely sure on that though; memory can play tricks. The current checks are: adsb@coccia:$ dak admin v-c list-suite proposed-updates proposed-updates MustBeNewerThan oldoldoldstable proposed-updates MustBeNewerThan oldoldstable proposed-updates MustBeNewerThan stable proposed-updates Enhances stable proposed-updates MustBeNewerThan oldstable proposed-updates MustBeOlderThan experimental > Before I upload a fix, I'd like you to double check that these > versions do not validate the ordering rules: > > nvidia-openjdk-8-jre_9.+8u332-ga-1~~deb9u1~11.2.2-3+deb11u3_amd64.deb > nvidia-openjdk-8-jre_9.+8u312-b07-1~11.2.2+8u302-b08-1~11.2.2- > 3+deb11u3_ppc64el.deb > nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.4.3-3 | testing/non-free | amd64, ppc64el nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.4.3-3 | unstable/non-free | amd64, ppc64el nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.5.1-2 | experimental/non-free | amd64, ppc64el $ dpkg --compare-versions "9.+8u332-ga-1~~deb9u1~11.2.2-3+deb11u3" lt "9.+8u332-ga-1~11.4.3-3" && echo y y $ dpkg --compare-versions "9.+8u312-b07-1~11.2.2+8u302-b08-1~11.2.2-3+deb11u3" lt "9.+8u332-ga-1~11.4.3-3" && echo y y Both look OK so far as I can see, and already sort below the version in testing so don't present any issues with prop-ups etc. Regards, Adam
Bug#1011365: bullseye-pu: package nvidia-cuda-toolkit/11.2.2-3+deb11u2
On 29/05/2022 16.16, Adam D. Barratt wrote: Unfortunately the amd64 upload got rejected: Version check failed: Your upload included the binary package nvidia-openjdk-8-jre, version 9.+8u332-ga-1~deb9u1~11.2.2-3+deb11u2, for amd64, however experimental already has version 9.+8u332-ga-1~11.5.1-2. Uploads to proposed-updates must have a lower version than present in experimental. Oh yes. 1~d < 1 1~d~1 > 1~1 Is there a similar constraint for sid as well? I would have expected that to trigger first ... and probably s/already/only/ ... Before I upload a fix, I'd like you to double check that these versions do not validate the ordering rules: nvidia-openjdk-8-jre_9.+8u332-ga-1~~deb9u1~11.2.2-3+deb11u3_amd64.deb nvidia-openjdk-8-jre_9.+8u312-b07-1~11.2.2+8u302-b08-1~11.2.2-3+deb11u3_ppc64el.deb nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.2.2-3+deb11u1~bpo10+1| buster-backports/non-free | amd64, ppc64el nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.2.2-3+deb11u1| stable/non-free | amd64, ppc64el nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.2.2+8u302-b08-1~11.2.2-3+deb11u2 | proposed-updates/non-free | ppc64el nvidia-openjdk-8-jre | 9.+8u312-b07-1~11.4.3-2+b2 | testing/non-free | amd64, ppc64el nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.4.3-3 | unstable/non-free | amd64, ppc64el nvidia-openjdk-8-jre | 9.+8u332-ga-1~11.5.1-2 | experimental/non-free | amd64, ppc64el Andreas From cc22d938063d02ab5f193b6fc7d845ee5e9e57ce Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Mon, 30 May 2022 01:28:04 +0200 Subject: [PATCH] fix nvidia-openjdk-8-jre version ordering --- debian/changelog| 6 ++ debian/rules| 2 +- debian/rules.version_prefix | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f68e95e..63bcae0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nvidia-cuda-toolkit (11.2.2-3+deb11u3) UNRELEASED; urgency=medium + + * Fix nvidia-openjdk-8-jre version ordering. + + -- Andreas Beckmann Sun, 29 May 2022 21:50:33 +0200 + nvidia-cuda-toolkit (11.2.2-3+deb11u2) bullseye; urgency=medium * Use a snapshot of openjdk-8-jre (8u332-ga-1~deb9u1) for amd64. diff --git a/debian/rules b/debian/rules index ce9a8b5..f568fa6 100755 --- a/debian/rules +++ b/debian/rules @@ -100,7 +100,7 @@ jre_depends.Debian ?= $(if $(jre_pkg),$(jre_pkg_dep) |) openjdk-8-jre jre_depends.Ubuntu ?= openjdk-8-jre | $(jre_pkg_dep) ifneq (,$(jre_pkg)) -$(jre_pkg).VERSION = $(OPENJDK_VERSION) +$(jre_pkg).VERSION = $(subst ~,~~,$(OPENJDK_VERSION)) endif ifneq (,$(thrust_pkg)) diff --git a/debian/rules.version_prefix b/debian/rules.version_prefix index 9194940..b351e0f 100644 --- a/debian/rules.version_prefix +++ b/debian/rules.version_prefix @@ -11,7 +11,7 @@ nvidia-cuda-gdb.PREV_VERSION= 11.2.152 nvidia-profiler.PREV_VERSION= 11.2.152 nvidia-openjdk-8-jre.VERSION_PREFIX = 9.+ -nvidia-openjdk-8-jre.PREV_VERSION = 9.+8u332-ga-1~deb9u1 +nvidia-openjdk-8-jre.PREV_VERSION = 9.+8u332-ga-1~~deb9u1 ifeq (ppc64el,$(DEB_HOST_ARCH)) nvidia-openjdk-8-jre.VERSION_PREFIX = 9.+8u312-b07-1~11.2.2+ nvidia-openjdk-8-jre.PREV_VERSION = 9.+8u312-b07-1~11.2.2+8u302-b08-1 -- 2.20.1
Bug#1011365: bullseye-pu: package nvidia-cuda-toolkit/11.2.2-3+deb11u2
On Fri, 2022-05-20 at 23:44 +0200, Andreas Beckmann wrote: > the nvidia-cuda-toolkit 11.2.2-3+deb11u1 bullseye-pu update > unfortunately updated the bundled openjdk-8 binary snapshot to a > version > not runnable on bullseye since it added dependencies on versioned > symbols from a newer glibc. > That was not noticed at build time since dpkg-gensymbols (?) only > issued > a warning for the missing symbol version and not an error like for a > fully > missing symbol. > We now have a test to ensure the java binary is actually usable ;-) > For amd64 we use a newer binary snapshot built in stretch (lts), for > ppc64el we had to go back to a previously used snapshot and munge the > version a bit. > Unfortunately the amd64 upload got rejected: Version check failed: Your upload included the binary package nvidia-openjdk-8-jre, version 9.+8u332-ga-1~deb9u1~11.2.2-3+deb11u2, for amd64, however experimental already has version 9.+8u332-ga-1~11.5.1-2. Uploads to proposed-updates must have a lower version than present in experimental. Regards, Adam
Bug#1011365: bullseye-pu: package nvidia-cuda-toolkit/11.2.2-3+deb11u2
Package: release.debian.org Severity: normal Tags: bullseye User: release.debian@packages.debian.org Usertags: pu Hi, the nvidia-cuda-toolkit 11.2.2-3+deb11u1 bullseye-pu update unfortunately updated the bundled openjdk-8 binary snapshot to a version not runnable on bullseye since it added dependencies on versioned symbols from a newer glibc. That was not noticed at build time since dpkg-gensymbols (?) only issued a warning for the missing symbol version and not an error like for a fully missing symbol. We now have a test to ensure the java binary is actually usable ;-) For amd64 we use a newer binary snapshot built in stretch (lts), for ppc64el we had to go back to a previously used snapshot and munge the version a bit. Another bug was reported for nsight-compute that was looking for some resources in a different location than where we shipped them. These bug reports show that there are actually users for these packages in stable ;-) The updated package is already uploaded. Andreas diff --git a/debian/changelog b/debian/changelog index 92c791a..f68e95e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +nvidia-cuda-toolkit (11.2.2-3+deb11u2) bullseye; urgency=medium + + * Use a snapshot of openjdk-8-jre (8u332-ga-1~deb9u1) for amd64. + * Use a snapshot of openjdk-8-jre (8u302-b08-1) for ppc64el. + * Check usability of the java binary. (Closes: #1008591) + * nsight-compute: Move the 'sections' folder to a multiarch location. +(Closes: #1009719) + * Upload to bullseye. + + -- Andreas Beckmann Fri, 20 May 2022 09:48:41 +0200 + nvidia-cuda-toolkit (11.2.2-3+deb11u1) bullseye; urgency=medium * cuda-gdb: Disable non-functional python support causing segmentation diff --git a/debian/gbp.conf b/debian/gbp.conf index 8947feb..438a5c5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -10,8 +10,9 @@ component = [ 'amd64', 'ppc64el', 'arm64', - 'openjdk-8-source-8u312-b07-1', - 'openjdk-8-jre-amd64-8u312-b07-1', - 'openjdk-8-jre-ppc64el-8u312-b07-1', + 'openjdk-8-source-8u302-b08-1', + 'openjdk-8-source-8u332-ga-1-d9u1', + 'openjdk-8-jre-amd64-8u332-ga-1-d9u1', + 'openjdk-8-jre-ppc64el-8u302-b08-1', ] debian-branch = bullseye diff --git a/debian/nsight-compute.install b/debian/nsight-compute.install index bb8ddf7..8323707 100755 --- a/debian/nsight-compute.install +++ b/debian/nsight-compute.install @@ -3,6 +3,6 @@ nsight_compute/ncu usr/lib/nsight-compute/ nsight_compute/ncu-ui usr/lib/nsight-compute/ [amd64] nsight_compute/nv-nsight-cuusr/lib/nsight-compute/ [amd64] nsight_compute/nv-nsight-cu-cliusr/lib/nsight-compute/ -nsight_compute/sections/ usr/lib/nsight-compute/ +nsight_compute/sections/ usr/lib/${DEB_HOST_MULTIARCH}/nsight-compute/ nsight_compute/extras/ usr/lib/nsight-compute/ nsight_compute/host/ usr/lib/nsight-compute/ [amd64] diff --git a/debian/nvidia-openjdk-8-jre.lintian-overrides b/debian/nvidia-openjdk-8-jre.lintian-overrides index 01265ef..b888f3d 100644 --- a/debian/nvidia-openjdk-8-jre.lintian-overrides +++ b/debian/nvidia-openjdk-8-jre.lintian-overrides @@ -5,10 +5,9 @@ executable-in-usr-lib hardening-no-bindnow hardening-no-fortify-functions image-file-in-usr-lib -library-not-linked-against-libc package-contains-documentation-outside-usr-share-doc package-has-unnecessary-activation-of-ldconfig-trigger exit-in-shared-library repeated-path-segment -shared-library-lacks-prerequisites +[!amd64]: shared-library-lacks-prerequisites spelling-error-in-binary diff --git a/debian/rules b/debian/rules index 0264dfc..ce9a8b5 100755 --- a/debian/rules +++ b/debian/rules @@ -310,6 +310,11 @@ execute_before_dh_auto_build: build-stamp override_dh_auto_build-arch: dh_auto_build --sourcedirectory=cuda-gdb -- V=1 +ifneq (,$(jre_pkg)) +execute_before_dh_auto_test-arch: + openjdk-8-jre/$(CUDA_JAVA_HOME)/bin/java -version +endif + execute_before_dh_auto_install: rm -rf debian/tmp cp -al build/ debian/tmp diff --git a/debian/rules.defs b/debian/rules.defs index 528807a..6c045b4 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -102,7 +102,9 @@ nsight-systems-target.VERSION= $(CUDA_VERSION_nsight_systems) DEFAULT_GCC_VERSION = 10 -OPENJDK_VERSION.default = 8u312-b07-1 +OPENJDK_VERSION.default = 8u332-ga-1 +OPENJDK_VERSION.amd64 = 8u332-ga-1~deb9u1 +OPENJDK_VERSION.ppc64el = 8u302-b08-1 NSIGHT_COMPUTE_DESKTOP_DIR.amd64= linux-desktop-glibc_2_11_3-x64 NSIGHT_COMPUTE_DESKTOP_DIR.i386 = linux-desktop-glibc_2_11_3-x86 diff --git a/debian/rules.version_prefix b/debian/rules.version_prefix index 36c82ed..9194940 100644 ---