UBUNTU: [Packaging] signing -- switch to raw-signing tarballs

BugLink: http://bugs.launchpad.net/bugs/1764794Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

debian/rules.d/2-binary-arch.mk

@@ -98,7 +98,7 @@ install-%: pkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*
 install-%: pkgdir_ex = $(CURDIR)/debian/$(extra_pkg_name)-$*
 install-%: bindoc = $(pkgdir)/usr/share/doc/$(bin_pkg_name)-$*
 install-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
-install-%: signed = $(CURDIR)/debian/$(bin_pkg_name)-signed
+install-%: signingv = $(CURDIR)/debian/$(bin_pkg_name)-signing/$(release)-$(revision)
 install-%: toolspkgdir = $(CURDIR)/debian/$(tools_flavour_pkg_name)-$*
 install-%: cloudpkgdir = $(CURDIR)/debian/$(cloud_flavour_pkg_name)-$*
 install-%: basepkg = $(hdrs_pkg_name)
@@ -141,13 +141,13 @@ else
 endif
 
 ifeq ($(uefi_signed),true)
-	install -d $(signed)/$(release)-$(revision)
+	install -d $(signingv)
 	# Check to see if this supports handoff, if not do not sign it.
 	# Check the identification area magic and version >= 0x020b
 	handoff=`dd if="$(pkgdir)/boot/$(instfile)-$(abi_release)-$*" bs=1 skip=514 count=6 2>/dev/null | od -s | gawk '($$1 == 0 && $$2 == 25672 && $$3 == 21362 && $$4 >= 523) { print "GOOD" }'`; \
 	if [ "$$handoff" = "GOOD" ]; then \
 		cp -p $(pkgdir)/boot/$(instfile)-$(abi_release)-$* \
-			$(signed)/$(release)-$(revision)/$(instfile)-$(abi_release)-$*.efi; \
+			$(signingv)/$(instfile)-$(abi_release)-$*.efi; \
 	fi
 endif
 
@@ -696,16 +696,16 @@ ifeq ($(do_cloud_tools),true)
 	dh_builddeb -p$(cloudpkg)
 endif
 
-binary-debs: signed = $(CURDIR)/debian/$(bin_pkg_name)-signed
-binary-debs: signedv = $(CURDIR)/debian/$(bin_pkg_name)-signed/$(release)-$(revision)
-binary-debs: signed_tar = $(src_pkg_name)_$(release)-$(revision)_$(arch).tar.gz
+binary-debs: signing = $(CURDIR)/debian/$(bin_pkg_name)-signing
+binary-debs: signingv = $(CURDIR)/debian/$(bin_pkg_name)-signing/$(release)-$(revision)
+binary-debs: signing_tar = $(src_pkg_name)_$(release)-$(revision)_$(arch).tar.gz
 binary-debs: binary-perarch $(addprefix binary-,$(flavours))
 	@echo Debug: $@
 ifeq ($(uefi_signed),true)
-	echo $(release)-$(revision) > $(signedv)/version
-	cd $(signedv) && ls *.efi >flavours
-	cd $(signed) && tar czvf ../../../$(signed_tar) .
-	dpkg-distaddfile $(signed_tar) raw-uefi -
+	install -d $(signingv)/control
+	{ echo "tarball"; echo "signed-only"; } >$(signingv)/control/options
+	cd $(signing) && tar czvf ../../../$(signing_tar) .
+	dpkg-distaddfile $(signing_tar) raw-signing -
 endif
 
 build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-build-,$(flavours))