From eae47c67a6f2e43f78b5bd924104fbd05682667c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 1 Jul 2024 09:01:53 +0200 Subject: [PATCH 1/2] ensure shim-helpers is installed in build environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit else the dpkg-query doesn't work. Signed-off-by: Fabian Grünbichler --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index b72c0c1..3ea8290 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Debian EFI Team Uploaders: Steve McIntyre <93sam@debian.org>, Steve Langasek Build-Depends: debhelper (>= 13), shim-unsigned (= 15.8-1), + shim-helpers-amd64-signed [amd64], + shim-helpers-arm64-signed [arm64], # sbsigntool before 0.9.2-2 had a horrid bug with checksum calculation # which broke our build sbsigntool (>= 0.9.2-2), From c49e24245a8fcb6bdad256c035177061dd59fa64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 1 Jul 2024 09:03:12 +0200 Subject: [PATCH 2/2] d/rules: import architecture.mk earlier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit else DEB_HOST_ARCH is not potentially not yet set and some invocations might print a spurious warning. Signed-off-by: Fabian Grünbichler --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 0ae32fb..d5c87e6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,12 @@ #! /usr/bin/make -f +include /usr/share/dpkg/architecture.mk + VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) SHIM_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim-unsigned) SHIM_HELPERS_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim-helpers-$(DEB_HOST_ARCH)-signed) VENDOR := $(shell dpkg-vendor --query vendor) -include /usr/share/dpkg/architecture.mk - ifeq ($(DEB_HOST_ARCH),amd64) export EFI_ARCH := x64 endif