UBUNTU: [Debian] remove nvidia dkms build support

We no longer need to generate signatures for nvidia modules during our
kernel build, as they are signed using the ubuntu drivers key. Remove
support for building the nvidia modules.

We must still keep the dkms-build--* scripts for now, as our tooling
currently syncs these scripts from the kernel tree into
linux-restricted-modules.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian/rules b/debian/rules
index 1d53ecc1df7f308da6663195f49c4097c818c15f..1628610d3a409ddd93cf82b474889f1d30235022 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,8 +53,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
        do_tools=false
        disable_d_i=true
        do_zfs=false
-       do_dkms_nvidia=false
-       do_dkms_nvidia_server=false
 endif
 
 # Are any of the kernel signing options enabled.
@@ -87,8 +85,6 @@ ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
        flavours := $(firstword $(flavours))
        disable_d_i=true
        do_zfs=false
-       do_dkms_nvidia=false
-       do_dkms_nvidia_server=false
 endif
 
 # Being used to build a mainline build -- turn off things which do not work.
@@ -97,8 +93,6 @@ ifeq ($(do_mainline_build),true)
        do_tools=false
        no_dumpfile=1
        do_zfs=false
-       do_dkms_nvidia=false
-       do_dkms_nvidia_server=false
        skipabi=true
        skipmodule=true
        skipretpoline=true

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index ba1c5db2617e89292226373f3af8ca278ba393ae..6395bbecd41e146ff66b7226c3a31f7813fc77ba 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -70,18 +70,6 @@ define build_dkms =
        CROSS_COMPILE=$(CROSS_COMPILE) $(SHELL) $(DROOT)/scripts/dkms-build $(dkms_dir) $(abi_release)-$* '$(call build_dkms_sign,$(builddir)/build-$*)' $(1) $(2) $(3) $(4) $(5)
 endef
 
-# nvidia_build_payload 450 450 450_450.102.04-0ubuntu0.20.04.1
-# nvidia_build_payload 450-server 450srv 50.102.04-0ubuntu0.20.04.1
-define nvidia_build_payload =
-       $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-$(2), pool/restricted/n/nvidia-graphics-drivers-$(1)/nvidia-kernel-source-$(1)_$(3)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-$(1)/nvidia-dkms-$(1)_$(3)_$(arch).deb)
-endef
-# nvidia_build 450
-# nvidia_build 450-server
-define nvidia_build =
-       $(call nvidia_build_payload,$(1),$(shell echo $(1) | sed -e 's/-server/srv/'),$(shell awk '/^nvidia-graphics-drivers-$(1) / {print($$2);}' debian/dkms-versions))
-
-endef
-
 define install_control =
        for which in $(3);                                                      \
        do                                                                      \
@@ -428,13 +416,6 @@ endif
 
        $(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_zfs), zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb))
 
-ifeq ($(do_dkms_nvidia),true)
-       $(foreach series,$(nvidia_desktop_series),$(call nvidia_build,$(series)))
-endif
-ifeq ($(do_dkms_nvidia_server),true)
-       $(foreach series,$(nvidia_server_series),$(call nvidia_build,$(series)))
-endif
-
 ifneq ($(skipdbg),true)
        # Add .gnu_debuglink sections to each stripped .ko
        # pointing to unstripped verson