diff -Nru fwupd-1.4.7/debian/changelog fwupd-1.4.7/debian/changelog
--- fwupd-1.4.7/debian/changelog	2021-03-27 02:45:02.000000000 +0800
+++ fwupd-1.4.7/debian/changelog	2021-05-04 07:05:41.000000000 +0800
@@ -1,3 +1,9 @@
+fwupd (1.4.7-0~20.10.2~p4) groovy; urgency=medium
+
+  * debian/ruls: merge upstream sbat related change.
+
+ -- Yuan-Chen Cheng <yc.cheng@canonical.com>  Tue, 04 May 2021 07:05:41 +0800
+
 fwupd (1.4.7-0~20.10.1) groovy; urgency=medium
 
   * new upstream version (1.4.7)
diff -Nru fwupd-1.4.7/debian/rules fwupd-1.4.7/debian/rules
--- fwupd-1.4.7/debian/rules	2020-07-30 21:27:24.000000000 +0800
+++ fwupd-1.4.7/debian/rules	2021-05-04 07:01:33.000000000 +0800
@@ -10,24 +10,52 @@
 	export DEB_CFLAGS_MAINT_APPEND = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 endif
 
+CONFARGS =
+
 ifneq ($(CI),)
-	export CI=--werror --wrap-mode=default
+	CONFARGS += --werror --wrap-mode=default
 endif
 
-regenerate_control:
-	OS=debian-x86_64 ./contrib/ci/generate_debian.py
-
 SB_STYLE := debian
 deb_version := $(shell dpkg-parsechangelog --show-field Version)
+export FLASHROM=-Dplugin_flashrom=false
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	SB_STYLE := ubuntu
 	tar_name := fwupd_$(deb_version)_$(DEB_HOST_ARCH).tar.gz
-	export FLASHROM=-Dplugin_flashrom=false
+	CONFARGS += -Dplugin_flashrom=false
+	CONFARGS += -Defi_sbat_distro_id=ubuntu
+	CONFARGS += -Defi_sbat_distro_summary=Ubuntu
+	CONFARGS += -Defi_sbat_distro_pkgname=fwupd
+	CONFARGS += -Defi_sbat_distro_version=$(deb_version)
+	CONFARGS += -Defi_sbat_distro_url="https://launchpad.net/ubuntu/+source/fwupd"
 else
 	TMPLDIR  := debian/fwupd-$(DEB_HOST_ARCH)-signed-template/usr/share/code-signing/fwupd-$(DEB_HOST_ARCH)-signed-template
-	export FLASHROM=-Dplugin_flashrom=true
+	ifneq ($(DEB_HOST_ARCH_CPU),ia64)
+		CONFARGS += -Dplugin_flashrom=true
+	else
+		CONFARGS += -Dplugin_flashrom=false
+	endif
+	CONFARGS += -Defi_sbat_distro_id=debian
+	CONFARGS += -Defi_sbat_distro_summary=Debian
+	CONFARGS += -Defi_sbat_distro_pkgname=fwupd
+	CONFARGS += -Defi_sbat_distro_version=$(deb_version)
+	CONFARGS += -Defi_sbat_distro_url="https://tracker.debian.org/pkg/fwupd"
+endif
+
+ifeq (yes,$(shell pkg-config --exists libsmbios_c && echo yes))
+	CONFARGS += -Dplugin_dell=true
+else
+	CONFARGS += -Dplugin_dell=false
 endif
 
+ifeq (yes,$(shell pkg-config --exists efivar && echo yes))
+	CONFARGS += -Dplugin_uefi=true -Dplugin_redfish=true -Dplugin_nvme=true
+else
+	CONFARGS += -Dplugin_uefi=false -Dplugin_redfish=false -Dplugin_nvme=false
+endif
+
+CONFARGS += -Dplugin_dummy=true -Dgtkdoc=true
+
 %:
 	dh $@ --with gir
 
@@ -39,17 +67,7 @@
 endif
 
 override_dh_auto_configure:
-	if pkg-config --exists libsmbios_c; then \
-		export DELL="-Dplugin_dell=true"; \
-	else \
-		export DELL="-Dplugin_dell=false"; \
-	fi; \
-	if pkg-config --exists efivar; then \
-		export UEFI="-Dplugin_uefi=true -Dplugin_redfish=true -Dplugin_nvme=true"; \
-	else \
-		export UEFI="-Dplugin_uefi=false -Dplugin_redfish=false -Dplugin_nvme=false"; \
-	fi; \
-	dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true
+	dh_auto_configure -- $(CONFARGS)
 
 override_dh_install:
 	find debian/tmp/usr -type f -name "*a" -print | xargs rm -f
@@ -59,7 +77,9 @@
 	if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
 		dh_install -pfwupd usr/libexec/fwupd/efi ;\
 	fi
-	dh_missing -a --fail-missing
+	if [ -z "$$CI" ]; then \
+		dh_missing -a --fail-missing; \
+	fi
 
 	#this is placed in fwupd-tests
 	rm -f debian/fwupd/usr/lib/*/fwupd-plugins-3/libfu_plugin_test.so