diff -Nru linux-restricted-modules-oem-5.10-5.10.0/debian/changelog linux-restricted-modules-oem-5.10-5.10.0/debian/changelog
--- linux-restricted-modules-oem-5.10-5.10.0/debian/changelog	2021-03-24 09:59:05.000000000 +0000
+++ linux-restricted-modules-oem-5.10-5.10.0/debian/changelog	2021-03-26 04:53:30.000000000 +0000
@@ -1,3 +1,18 @@
+linux-restricted-modules-oem-5.10 (5.10.0-1020.21+2) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] resync dkms-build and family
+    - [Packaging] handle half converted primary package
+
+ -- Andy Whitcroft <apw@canonical.com>  Fri, 26 Mar 2021 04:53:30 +0000
+
+linux-restricted-modules-oem-5.10 (5.10.0-1020.21+1) focal; urgency=medium
+
+  * Packaging resync (LP: #1786013)
+    - Revert "UBUNTU: [Packaging] resync dkms-build and family"
+
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Thu, 25 Mar 2021 23:28:40 +0200
+
 linux-restricted-modules-oem-5.10 (5.10.0-1020.21) focal; urgency=medium
 
   * Master version: 5.10.0-1020.21
diff -Nru linux-restricted-modules-oem-5.10-5.10.0/debian/scripts/dkms-build--nvidia-N linux-restricted-modules-oem-5.10-5.10.0/debian/scripts/dkms-build--nvidia-N
--- linux-restricted-modules-oem-5.10-5.10.0/debian/scripts/dkms-build--nvidia-N	2021-03-24 08:16:42.000000000 +0000
+++ linux-restricted-modules-oem-5.10-5.10.0/debian/scripts/dkms-build--nvidia-N	2021-03-26 04:48:12.000000000 +0000
@@ -78,8 +78,27 @@
 		# We are building for and archive custom signing upload.  Keep everything.
 		:
 	elif [ "$sign" = "--lrm" ]; then
-		# We are in the LRM build; grab sha256 checksums and clean up.
-		sha256sum -b *.ko >"SHA256SUMS"
+		# We are in LRM build the package a copy in any signatures we can
+		# find for them.  These will be added after linking.
+		base="/usr/lib/linux/$abi_flavour"
+
+		# Check the GCC version we are using against that used in the kernel
+		# NOTE: that we treat this as only a warning, as if the binaries did come
+		# out differently then we will actually 
+		echo "II: checking gcc version ..."
+		cat "$base/compiler"
+		gcc --version
+		gcc_was=$(cat "$base/compiler" | sed -e 's/^GCC:/gcc/')
+		gcc_is=$(gcc --version | head -1)
+		if [ "$gcc_was" != "$gcc_is" ]; then
+			echo "WW: gcc version missmatch between linux and linux-restricted-modules"
+			echo "WW: was: $gcc_was  is: $gcc_is"
+		fi
+
+		# Apply any local signatures.
+		echo "II: adding signatures from $base ..."
+		cp "$base/signatures/$package/"*".ko.sig" "$pkgdir/bits"
+		sha256sum -c "$base/signatures/$package/SHA256SUMS" || exit 1
 		sh ./CLEAN
 
 		sed -i '/objdump/d' ./BUILD