[PATCH 6/10][SRU][Aws-5.3][L-R-M] UBUNTU: [packaging] Replace nvidia 440 with 450
Alberto Milone
alberto.milone at canonical.com
Tue Aug 25 15:47:52 UTC 2020
The 450 series replaces the 440 series, which we
are adding transitional packages for.
BugLink: https://bugs.launchpad.net/bugs/1887674
Signed-off-by: Alberto Milone <alberto.milone at canonical.com>
---
debian/control.d/meta-nvidia | 12 ++++++------
debian/control.d/nvidia | 4 ++--
debian/control.d/transitionals-nvidia-440 | 6 ++++++
debian/dkms-versions | 2 +-
debian/rules | 16 ++++++++--------
5 files changed, 23 insertions(+), 17 deletions(-)
create mode 100644 debian/control.d/transitionals-nvidia-440
diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia
index 08edc3b..2105266 100644
--- a/debian/control.d/meta-nvidia
+++ b/debian/control.d/meta-nvidia
@@ -24,15 +24,15 @@ Description: Extra drivers for nvidia-435 for aws${variant:suffix}
Install extra signed nvidia-435 modules compatible with
aws${variant:suffix}
-Package: linux-modules-nvidia-440-aws${variant:suffix}
+Package: linux-modules-nvidia-450-aws${variant:suffix}
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
-Provides: ${dkms:nvidia-440-modules}
+Provides: ${dkms:nvidia-450-modules}
Depends:
${misc:Depends},
- linux-modules-nvidia-440- at ABI@-aws (= ${binary:Version}),
- ${nvk:nvidia-440}
-Description: Extra drivers for nvidia-440 for aws${variant:suffix}
- Install extra signed nvidia-440 modules compatible with
+ linux-modules-nvidia-450- at ABI@-aws (= ${binary:Version}),
+ ${nvk:nvidia-450}
+Description: Extra drivers for nvidia-450 for aws${variant:suffix}
+ Install extra signed nvidia-450 modules compatible with
aws${variant:suffix}
diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia
index 24b8ac7..d0f79d8 100644
--- a/debian/control.d/nvidia
+++ b/debian/control.d/nvidia
@@ -36,7 +36,7 @@ Description: Linux kernel nvidia modules for version @ABI@
which will ensure that upgrades work correctly, and that supporting packages are
also installed.
-Package: linux-modules-nvidia-440- at ABI@-aws
+Package: linux-modules-nvidia-450- at ABI@-aws
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
@@ -51,6 +51,6 @@ Description: Linux kernel nvidia modules for version @ABI@
This package contains the Linux kernel nvidia modules for version @ABI at .
.
You likely do not want to install this package directly. Instead, install the
- one of the linux-modules-nvidia-440-aws* meta-packages,
+ one of the linux-modules-nvidia-450-aws* meta-packages,
which will ensure that upgrades work correctly, and that supporting packages are
also installed.
diff --git a/debian/control.d/transitionals-nvidia-440 b/debian/control.d/transitionals-nvidia-440
new file mode 100644
index 0000000..e476eb4
--- /dev/null
+++ b/debian/control.d/transitionals-nvidia-440
@@ -0,0 +1,6 @@
+Package: linux-modules-nvidia-440-aws
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-450-aws
+Description: Extra drivers for nvidia-440 for the aws flavour (dummy transitional package)
+ Transitional package for upgrades of -440 to -450.
diff --git a/debian/dkms-versions b/debian/dkms-versions
index 0f282cc..1722c91 100644
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -2,7 +2,7 @@ spl-linux 0.7.5-1ubuntu2.2
zfs-linux 0.7.5-1ubuntu16.9
nvidia-graphics-drivers-390 390.138-0ubuntu0.18.04.1
nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.3
-nvidia-graphics-drivers-440 440.100-0ubuntu0.18.04.1
+nvidia-graphics-drivers-450 0
nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.18.04.1
nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.18.04.1
wireguard-linux-compat 1.0.20200611-1ubuntu1~18.04.1
diff --git a/debian/rules b/debian/rules
index cefbaee..3b43821 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,11 @@ src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//')
dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions)
dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435 / { print $$2; }' debian/dkms-versions)
-dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { print $$2; }' debian/dkms-versions)
+dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions)
nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1)
nvidia_435_upstream_version=$(shell echo "$(dkms_nvidia_435_version)" | cut -d '-' -f 1)
-nvidia_440_upstream_version=$(shell echo "$(dkms_nvidia_440_version)" | cut -d '-' -f 1)
+nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1)
# Get variants, assuming primary if debian/variants is not present
variants = --
@@ -139,10 +139,10 @@ nvidia-%:
$(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-435-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-435-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-435, pool/restricted/n/nvidia-graphics-drivers-435/nvidia-kernel-source-435_$(dkms_nvidia_435_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-435/nvidia-dkms-435_$(dkms_nvidia_435_version)_$(arch).deb)
$(call install_control,linux-modules-nvidia-435-$(src_abi)-$*,$*,nvidia,435,postinst postrm prerm config templates)
- install -d debian/linux-modules-nvidia-440-$(src_abi)-$*
- install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers
- $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb)
- $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,postinst postrm prerm config templates)
+ install -d debian/linux-modules-nvidia-450-$(src_abi)-$*
+ install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers
+ $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-450, pool/restricted/n/nvidia-graphics-drivers-450/nvidia-kernel-source-450_$(dkms_nvidia_450_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450/nvidia-dkms-450_$(dkms_nvidia_450_version)_$(arch).deb)
+ $(call install_control,linux-modules-nvidia-450-$(src_abi)-$*,$*,nvidia,450,postinst postrm prerm config templates)
prepare-dkms:
mkdir -p $(dkms_dir)
@@ -157,11 +157,11 @@ override_dh_auto_install: prepare-dkms $(flavours)
gencontrol_flags :=
gencontrol_flags += -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))"
gencontrol_flags += -Vdkms:nvidia-435-modules="nvidia-dkms-435 (= $(dkms_nvidia_435_version))"
-gencontrol_flags += -Vdkms:nvidia-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_version))"
+gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))"
gencontrol_flags += -Vnvk:nvidia-390="nvidia-kernel-common-390 (<= $(nvidia_390_upstream_version)-1), nvidia-kernel-common-390 (>= $(nvidia_390_upstream_version))"
gencontrol_flags += -Vnvk:nvidia-435="nvidia-kernel-common-435 (<= $(nvidia_435_upstream_version)-1), nvidia-kernel-common-435 (>= $(nvidia_435_upstream_version))"
-gencontrol_flags += -Vnvk:nvidia-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_upstream_version))"
+gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))"
override_dh_gencontrol:
dh_gencontrol -- $(gencontrol_flags)
--
2.25.1
More information about the kernel-team
mailing list