proxmox-mirrors/shim-signed
1
0
Fork 0
mirror of https://git.proxmox.com/git/shim-signed synced 2025-08-04 05:36:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-build' into 'master'

Browse Source 
fix shim-helpers substvar handling

See merge request efi-team/shim-signed!2
This commit is contained in:
Steve McIntyre 2024-07-03 00:05:26 +00:00
commit 704e0d1623
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -5,6 +5,8 @@ Maintainer: Debian EFI Team <debian-efi@lists.debian.org>
Uploaders: Steve McIntyre <93sam@debian.org>, Steve Langasek <vorlon@debian.org> Uploaders: Steve McIntyre <93sam@debian.org>, Steve Langasek <vorlon@debian.org>
Build-Depends: debhelper (>= 13), Build-Depends: debhelper (>= 13),
shim-unsigned (= 15.8-1), 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 # sbsigntool before 0.9.2-2 had a horrid bug with checksum calculation
# which broke our build # which broke our build
sbsigntool (>= 0.9.2-2), sbsigntool (>= 0.9.2-2),

4
debian/rules vendored
View File

@ -1,12 +1,12 @@
#! /usr/bin/make -f #! /usr/bin/make -f
include /usr/share/dpkg/architecture.mk
VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) 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_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) SHIM_HELPERS_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim-helpers-$(DEB_HOST_ARCH)-signed)
VENDOR := $(shell dpkg-vendor --query vendor) VENDOR := $(shell dpkg-vendor --query vendor)
include /usr/share/dpkg/architecture.mk
ifeq ($(DEB_HOST_ARCH),amd64) ifeq ($(DEB_HOST_ARCH),amd64)
export EFI_ARCH := x64 export EFI_ARCH := x64
endif endif