From ced2fa1ca4b04f0bacd2537d2c16f8c271af3b32 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 6 Aug 2020 07:59:16 +0100 Subject: [PATCH] trivial: Fix the Fedora CI --- contrib/ci/Dockerfile-fedora.in | 1 + contrib/fwupd.spec.in | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/ci/Dockerfile-fedora.in b/contrib/ci/Dockerfile-fedora.in index b8e18b6ec..29eb03faf 100644 --- a/contrib/ci/Dockerfile-fedora.in +++ b/contrib/ci/Dockerfile-fedora.in @@ -5,6 +5,7 @@ ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 RUN echo fubar > /etc/machine-id RUN dnf -y update +RUN dnf -y install https://kojipkgs.fedoraproject.org//packages/pesign/113/12.fc31/x86_64/pesign-113-12.fc31.x86_64.rpm RUN echo fubar > /etc/machine-id %%%INSTALL_DEPENDENCIES_COMMAND%%% RUN dnf -y update glib2 glib2-devel --releasever=32 diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in index 29660b37e..222aa0ca3 100644 --- a/contrib/fwupd.spec.in +++ b/contrib/fwupd.spec.in @@ -243,7 +243,10 @@ Data files for installed tests. %global efiarch aa64 %endif %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi -%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.signed +%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp +%define __pesign_client_cert fwupd-signer +%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed +rm -vf %{fwup_efi_fn}.tmp %endif mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg