diff -Nru nvidia-graphics-drivers-535-535.54.03/debian/changelog nvidia-graphics-drivers-535-535.54.03/debian/changelog
--- nvidia-graphics-drivers-535-535.54.03/debian/changelog	2023-06-27 14:38:17.000000000 +0000
+++ nvidia-graphics-drivers-535-535.54.03/debian/changelog	2023-07-03 13:34:05.000000000 +0000
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers-535 (535.54.03-0ubuntu0.20.04.4) focal; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * templates: encode amd64-only libraries and binaries
+  * debian: Enable arm64 builds (LP: #2025243).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 03 Jul 2023 13:34:05 +0000
+
 nvidia-graphics-drivers-535 (535.54.03-0ubuntu0.20.04.3) focal; urgency=medium
 
   [ Dimitri John Ledkov ]
diff -Nru nvidia-graphics-drivers-535-535.54.03/debian/control nvidia-graphics-drivers-535-535.54.03/debian/control
--- nvidia-graphics-drivers-535-535.54.03/debian/control	2023-06-27 14:38:17.000000000 +0000
+++ nvidia-graphics-drivers-535-535.54.03/debian/control	2023-07-03 13:34:05.000000000 +0000
@@ -28,7 +28,7 @@
 XS-Autobuild: yes
 
 Package: nvidia-driver-535
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  libnvidia-gl-535 (= ${binary:Version}),
  nvidia-dkms-535 (<= 535.54.03-1),
@@ -65,7 +65,7 @@
  for a complete list of supported GPUs and PCI IDs.
 
 Package: nvidia-kernel-source-535
-Architecture: amd64
+Architecture: amd64 arm64
 Multi-Arch: foreign
 Conflicts:
  nvidia-kernel-source
@@ -80,7 +80,7 @@
  driver.
 
 Package: nvidia-dkms-535
-Architecture: amd64
+Architecture: amd64 arm64
 Multi-Arch: foreign
 Conflicts:
  nvidia-dkms-kernel
@@ -105,7 +105,7 @@
  any new kernel headers that are installed.
 
 Package: nvidia-utils-535
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  ${shlibs:Depends}, ${misc:Depends}
 Suggests:
@@ -120,7 +120,7 @@
  This package contains supporting binaries for the NVIDIA driver.
 
 Package: libnvidia-compute-535
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Depends:
   ${misc:Depends}, ${shlibs:Depends}
@@ -152,7 +152,7 @@
  OpenCL.
 
 Package: nvidia-compute-utils-535
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  libnvidia-compute-535, adduser,
  ${misc:Depends}, ${shlibs:Depends}
@@ -171,7 +171,7 @@
  Pre-CUDA 4.0 APIs are not supported under CUDA MPS.
 
 Package: nvidia-headless-no-dkms-535
-Architecture: amd64
+Architecture: amd64 arm64
 Conflicts: nvidia-384 (<< 390.25), nvidia-390 (<< 390.25-0ubuntu1)
 Provides: nvidia-384
 Replaces: nvidia-384 (<< 390.25), nvidia-390 (<< 390.25-0ubuntu1)
@@ -193,7 +193,7 @@
  provided by the nvidia-driver-535 metapackage.
 
 Package: nvidia-headless-535
-Architecture: amd64
+Architecture: amd64 arm64
 Conflicts: nvidia-headless
 Provides: nvidia-headless
 Replaces: nvidia-headless
@@ -210,7 +210,7 @@
  provided by the nvidia-driver-535 metapackage.
 
 Package: nvidia-kernel-common-535
-Architecture: amd64
+Architecture: amd64 arm64
 Conflicts: nvidia-kernel-common
 Provides: nvidia-kernel-common
 Depends:
@@ -234,7 +234,7 @@
  module.
 
 Package: libnvidia-gl-535
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Conflicts: libnvidia-gl
 Replaces: libnvidia-gl, nvidia-384 (<< 390.25), nvidia-390 (<< 390.25-0ubuntu1)
@@ -259,7 +259,7 @@
  libraries.
 
 Package: libnvidia-extra-535
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Breaks: libnvidia-common-535 (<< 440.64-0ubuntu3~)
 Conflicts: libnvidia-extra
@@ -273,7 +273,7 @@
 
 Package: xserver-xorg-video-nvidia-535
 Section: non-free/x11
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  libnvidia-cfg1-535 (= ${binary:Version}),
  ${nvidia:xorgDepends},
@@ -292,7 +292,7 @@
  for a complete list of supported GPUs and PCI IDs.
 
 Package: libnvidia-cfg1-535
-Architecture: amd64
+Architecture: amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -312,7 +312,7 @@
  This package contains the libnvidia-cfg.so.1 runtime library.
 
 Package: libnvidia-fbc1-535
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -334,7 +334,7 @@
  This package contains the NvFBCOpenGL runtime library.
 
 Package: libnvidia-decode-535
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -355,7 +355,7 @@
  systems) library for the NVIDIA vendor implementation.
 
 Package: libnvidia-encode-535
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
diff -Nru nvidia-graphics-drivers-535-535.54.03/debian/nvidia-kernel-common-535.docs nvidia-graphics-drivers-535-535.54.03/debian/nvidia-kernel-common-535.docs
--- nvidia-graphics-drivers-535-535.54.03/debian/nvidia-kernel-common-535.docs	2023-06-27 14:38:17.000000000 +0000
+++ nvidia-graphics-drivers-535-535.54.03/debian/nvidia-kernel-common-535.docs	2023-07-03 13:34:05.000000000 +0000
@@ -1,2 +1,2 @@
-NVIDIA-Linux/systemd/system/nvidia-powerd.service
+#NVIDIA-Linux/systemd/system/nvidia-powerd.service
 
diff -Nru nvidia-graphics-drivers-535-535.54.03/debian/rules nvidia-graphics-drivers-535-535.54.03/debian/rules
--- nvidia-graphics-drivers-535-535.54.03/debian/rules	2023-06-27 14:37:15.000000000 +0000
+++ nvidia-graphics-drivers-535-535.54.03/debian/rules	2023-07-03 13:30:44.000000000 +0000
@@ -55,6 +55,15 @@
 armhf_excluded :=
 endif
 
+ifeq ($(DEB_HOST_ARCH),arm64)
+DKMS_disabled_modules :=
+arm64_only :=
+arm64_excluded := \#
+else
+arm64_only := \#
+arm64_excluded :=
+endif
+
 ifeq ($(DEB_HOST_ARCH),ppc64el)
 DKMS_disabled_modules :=
 ppc64el_only :=
@@ -198,10 +207,12 @@
 				 sed -e "s|flavour|$(flavour)|g"`; \
 		sed -e "s|#LIBDIR#|$(libdir)|g"         \
 			-e "s|#ARMHF_ONLY#|$(armhf_only)|g" \
+			-e "s|#ARM64_ONLY#|$(arm64_only)|g" \
 			-e "s|#AMD64_ONLY#|$(amd64_only)|g" \
 			-e "s|#I386_ONLY#|$(i386_only)|g" \
 			-e "s|#PPC64EL_ONLY#|$(ppc64el_only)|g" \
 			-e "s|#ARMHF_EXCLUDED#|$(armhf_excluded)|g" \
+			-e "s|#ARM64_EXCLUDED#|$(arm64_excluded)|g" \
 			-e "s|#AMD64_EXCLUDED#|$(amd64_excluded)|g" \
 			-e "s|#I386_EXCLUDED#|$(i386_excluded)|g" \
 			-e "s|#PPC64EL_EXCLUDED#|$(ppc64el_excluded)|g" \
diff -Nru nvidia-graphics-drivers-535-535.54.03/debian/templates/control.in nvidia-graphics-drivers-535-535.54.03/debian/templates/control.in
--- nvidia-graphics-drivers-535-535.54.03/debian/templates/control.in	2023-06-27 14:36:19.000000000 +0000
+++ nvidia-graphics-drivers-535-535.54.03/debian/templates/control.in	2023-07-03 13:30:44.000000000 +0000
@@ -28,7 +28,7 @@
 XS-Autobuild: yes
 
 Package: nvidia-driver-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  libnvidia-gl-#FLAVOUR# (= ${binary:Version}),
  nvidia-dkms-#FLAVOUR# (<= #DEBIAN_VERSION#-1),
@@ -65,7 +65,7 @@
  for a complete list of supported GPUs and PCI IDs.
 
 Package: nvidia-kernel-source-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Multi-Arch: foreign
 Conflicts:
  nvidia-kernel-source
@@ -80,7 +80,7 @@
  driver.
 
 Package: nvidia-dkms-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Multi-Arch: foreign
 Conflicts:
  nvidia-dkms-kernel
@@ -105,7 +105,7 @@
  any new kernel headers that are installed.
 
 Package: nvidia-utils-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  ${shlibs:Depends}, ${misc:Depends}
 Suggests:
@@ -120,7 +120,7 @@
  This package contains supporting binaries for the NVIDIA driver.
 
 Package: libnvidia-compute-#FLAVOUR#
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Depends:
   ${misc:Depends}, ${shlibs:Depends}
@@ -152,7 +152,7 @@
  OpenCL.
 
 Package: nvidia-compute-utils-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  libnvidia-compute-#FLAVOUR#, adduser,
  ${misc:Depends}, ${shlibs:Depends}
@@ -171,7 +171,7 @@
  Pre-CUDA 4.0 APIs are not supported under CUDA MPS.
 
 Package: nvidia-headless-no-dkms-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Conflicts: nvidia-384 (<< 390.25), nvidia-390 (<< 390.25-0ubuntu1)
 Provides: nvidia-384
 Replaces: nvidia-384 (<< 390.25), nvidia-390 (<< 390.25-0ubuntu1)
@@ -193,7 +193,7 @@
  provided by the nvidia-driver-#FLAVOUR# metapackage.
 
 Package: nvidia-headless-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Conflicts: nvidia-headless
 Provides: nvidia-headless
 Replaces: nvidia-headless
@@ -210,7 +210,7 @@
  provided by the nvidia-driver-#FLAVOUR# metapackage.
 
 Package: nvidia-kernel-common-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Conflicts: nvidia-kernel-common
 Provides: nvidia-kernel-common
 Depends:
@@ -234,7 +234,7 @@
  module.
 
 Package: libnvidia-gl-#FLAVOUR#
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Conflicts: libnvidia-gl
 Replaces: libnvidia-gl, nvidia-384 (<< 390.25), nvidia-390 (<< 390.25-0ubuntu1)
@@ -259,7 +259,7 @@
  libraries.
 
 Package: libnvidia-extra-#FLAVOUR#
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Breaks: libnvidia-common-#FLAVOUR# (<< 440.64-0ubuntu3~)
 Conflicts: libnvidia-extra
@@ -273,7 +273,7 @@
 
 Package: xserver-xorg-video-nvidia-#FLAVOUR#
 Section: non-free/x11
-Architecture: amd64
+Architecture: amd64 arm64
 Depends:
  libnvidia-cfg1-#FLAVOUR# (= ${binary:Version}),
  ${nvidia:xorgDepends},
@@ -292,7 +292,7 @@
  for a complete list of supported GPUs and PCI IDs.
 
 Package: libnvidia-cfg1-#FLAVOUR#
-Architecture: amd64
+Architecture: amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -312,7 +312,7 @@
  This package contains the libnvidia-cfg.so.1 runtime library.
 
 Package: libnvidia-fbc1-#FLAVOUR#
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -334,7 +334,7 @@
  This package contains the NvFBCOpenGL runtime library.
 
 Package: libnvidia-decode-#FLAVOUR#
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
@@ -355,7 +355,7 @@
  systems) library for the NVIDIA vendor implementation.
 
 Package: libnvidia-encode-#FLAVOUR#
-Architecture: i386 amd64
+Architecture: i386 amd64 arm64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
diff -Nru nvidia-graphics-drivers-535-535.54.03/debian/templates/nvidia-kernel-common-flavour.docs.in nvidia-graphics-drivers-535-535.54.03/debian/templates/nvidia-kernel-common-flavour.docs.in
--- nvidia-graphics-drivers-535-535.54.03/debian/templates/nvidia-kernel-common-flavour.docs.in	2023-06-27 14:35:10.000000000 +0000
+++ nvidia-graphics-drivers-535-535.54.03/debian/templates/nvidia-kernel-common-flavour.docs.in	2023-07-03 13:26:30.000000000 +0000
@@ -1,2 +1,2 @@
-#I386_EXCLUDED#NVIDIA-Linux/systemd/system/nvidia-powerd.service
+#AMD64_ONLY#NVIDIA-Linux/systemd/system/nvidia-powerd.service