From fa9957e9f54d3a996b4e2cde40caeaa0525de146 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 30 Jul 2019 22:49:46 -0400 Subject: [PATCH] import fwupdate-11-3.el8 --- .fwupdate.metadata | 1 + .gitignore | 1 + ...ency-chain-for-a-parallel-make-issue.patch | 25 ++ SOURCES/find-debuginfo-efi.sh | 29 ++ SOURCES/secureboot.cer | Bin 0 -> 839 bytes SOURCES/securebootca.cer | Bin 0 -> 977 bytes SPECS/fwupdate.spec | 359 ++++++++++++++++++ 7 files changed, 415 insertions(+) create mode 100644 .fwupdate.metadata create mode 100644 .gitignore create mode 100644 SOURCES/Fix-dependency-chain-for-a-parallel-make-issue.patch create mode 100755 SOURCES/find-debuginfo-efi.sh create mode 100644 SOURCES/secureboot.cer create mode 100644 SOURCES/securebootca.cer create mode 100644 SPECS/fwupdate.spec diff --git a/.fwupdate.metadata b/.fwupdate.metadata new file mode 100644 index 0000000..79e7384 --- /dev/null +++ b/.fwupdate.metadata @@ -0,0 +1 @@ +ac50edbe32f61d4402c10a0eaea4643f617132f6 SOURCES/fwupdate-11.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..333dca6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/fwupdate-11.tar.bz2 diff --git a/SOURCES/Fix-dependency-chain-for-a-parallel-make-issue.patch b/SOURCES/Fix-dependency-chain-for-a-parallel-make-issue.patch new file mode 100644 index 0000000..7f7d8b1 --- /dev/null +++ b/SOURCES/Fix-dependency-chain-for-a-parallel-make-issue.patch @@ -0,0 +1,25 @@ +From b75c3c6b2f6d50ea0054b5238e3cb00a31886fa9 Mon Sep 17 00:00:00 2001 +From: Xiami <1927254+Xiami2012@users.noreply.github.com> +Date: Tue, 10 Apr 2018 18:31:49 +0800 +Subject: [PATCH] Fix dependency chain for a parallel make issue + +See GitHub Issue #105 +--- + linux/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/linux/Makefile b/linux/Makefile +index 3c5f4908856..a2868114f67 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -60,6 +60,7 @@ include-dir : + $(INSTALL) -d -m 755 include ; \ + fi + ++fwupdate.c : | include/fwup.h + libfwup.c : | include/fwup.h + include/fwup.h : | include/fwup-version.h + include/fwup-version.h : | include-dir +-- +2.20.1 + diff --git a/SOURCES/find-debuginfo-efi.sh b/SOURCES/find-debuginfo-efi.sh new file mode 100755 index 0000000..b6198f5 --- /dev/null +++ b/SOURCES/find-debuginfo-efi.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# +# find-debuginfo-efi.sh +# Copyright 2017 Peter Jones +# +# Distributed under terms of the GPLv3 license. +# + +# trillian:~/build/BUILDROOT/fwupdate-8-5.fc27.x86_64$ ls -l usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96 usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96.debug usr/lib/debug/boot/efi/EFI/fedora/fwupx64.efi.debug +# lrwxrwxrwx. 1 pjones pjones 46 Jul 26 16:57 usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96 -> ../../../../../boot/efi/EFI/fedora/fwupx64.efi +# lrwxrwxrwx. 1 pjones pjones 43 Jul 26 16:57 usr/lib/debug/.build-id/fe/2390c7807b312e5fd9789af339b09a8317da96.debug -> ../../boot/efi/EFI/fedora/fwupx64.efi.debug +# -rwxr-xr-x. 1 pjones pjones 2.2M Jul 26 16:57 usr/lib/debug/boot/efi/EFI/fedora/fwupx64.efi.debug + +set -u +set -e + +for x in ${RPM_BUILD_ROOT}/usr/lib/debug/.build-id/*/* \ + $(find "${RPM_BUILD_ROOT}/usr/lib/debug" -iname '*.efi.debug') +do + link=$(readlink "${x}") || : + dn=$(dirname "${x}") + if [[ ${link} =~ .*/fwup[[:alnum:]]+\.efi(\.debug)*$ ]] || \ + [[ ${x} =~ .*/fwup[[:alnum:]]+\.efi(\.debug)*$ ]] ; then + echo "%dir ${dn}" | sed "s,${RPM_BUILD_ROOT},,g" + echo "${x}" | sed "s,${RPM_BUILD_ROOT},,g" + fi +done | sort | uniq >> debugfiles-efi.list + +# vim:fenc=utf-8:tw=75 diff --git a/SOURCES/secureboot.cer b/SOURCES/secureboot.cer new file mode 100644 index 0000000000000000000000000000000000000000..4ff8b79e6736e566dbf39603e0887a53345aa4e4 GIT binary patch literal 839 zcmXqLVs5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qc(A3<>AWEFq*xbO#zzobaj4}u^)G^S4Sf`BDy5h|A zyv)3GQtWJER6_O@BP#=Q6C*!^K@%evQxhX2!zT5vqmx`?o`(oz{$eeCezR_cLPyl% zHpefqUbuO&%O^nA}y6#9BjM%~U7Q(5kw6_YN1epR)|xb9Elg4_B`%!~|-ixmyz4P=2K zFU!Xw#v&5#_@80Rp3FS`6#W&an$HJBb(91l2O=d+v%~@6}B_2%&Mg` zDvt6_STWb-ZhXD^RgaJz3Cq5o4B43+oEZD&XVQnj{jXOGHfUJJB>qmC?A`ut>Ahpw zdM-|DZzz7Yc^I3-u|J*vqdKqQ`kIF?LJd~2r8XOg&f%Z+Yj((@r{(*;Y?_w8rSDJJ zntk_K74NJ(drfx5hIZaKImf>p{fSPd=}qfHlV8OA-0dHz$M#&#on!XF_3NjY{(Hxy zbKN4k{8NvC{Y9;Yo!51>R!)l5n2-{5CgAUe(k!NLc|1u*B2w==ttY-NzWb+N=75O& zzv2uf{%c3S9%5x`<-dQv`g=w9>l=;D-vz#WO}UeuefPU1`=|Tw9$I=mIi&>vg+x|L literal 0 HcmV?d00001 diff --git a/SOURCES/securebootca.cer b/SOURCES/securebootca.cer new file mode 100644 index 0000000000000000000000000000000000000000..b2354007b9668258683b99a68fa5bdd3067c31b1 GIT binary patch literal 977 zcmXqLVm@oo#I$t*GZP~d6DPykKFO2}lmD>>ylk9WZ60mkc^MhGSs4s`4b=@)*_cCF zn1$tnQd1N>5=#_OQj1C) zic(WD5=-=w^K%X4#CZ)(42%qc(8R>VG)kP;*xbO#zzoWzwslR6O2{5!WMyD(V&rEq zXkz4IYGPz$nC+~vi6EDouC4!V-;tv&JA zN}nf->iaHo2tM8rAb&8=Njdj{a^${=Z?aE)&k<1VH{Q3Wx7jKD-_5CYum4K4d~JV` z`ccOE*<7!m22LI4&u3g0F3h!NN?ysm?c*7~^lIfF3D-Xhnr_&uU!bJ$?ZS8WW+A0- zr9raw{Iep~On)hDAUrqc*pZy>@YoE^;z#ABPp))utMY{K9XOZuN+87Vv97^}gccFK z6&c%&T=rzVyKuJ1S>c?Rq?77kYS zv==`X%}MC|0a-81!fL?G$oL;QPJxLO7^jR3 zp{b9(0{X(lQ;+K%h_CKtxc%nd+9kH!CBia&JkgcqO9LvF9(I1~^2+p(_fBqs&+@+g zjZG)^b(y8?lr#NV`RkoR|I-BpaSiJiPBV7drX0Bbe!0fPB95K&)ygj1YM5%bK;(6L z=7Y@r2hM%A`uyr;o|A^(c{icYtu_B=WuE^MZ_<i|1QMhsQHT z4}wg*#%C!d<*ePQAKPyWoS|9R;jPUx*P-5Ksuo_~6c3tyKHzf+y+r*{_;vOAw> zmv4Wk&h*1hGe;ze)#t#BH;PsH)$e|FOmna8+@9jW!^ymRMf{q+C84h)mppfN*sxn6 NnfI|Q%N6m!6aeL$dME$@ literal 0 HcmV?d00001 diff --git a/SPECS/fwupdate.spec b/SPECS/fwupdate.spec new file mode 100644 index 0000000..673a171 --- /dev/null +++ b/SPECS/fwupdate.spec @@ -0,0 +1,359 @@ +%global efivar_version 35-1 +%global efibootmgr_version 16-1 +%global gnu_efi_version 3.0.8-1 +%undefine _debuginfo_subpackages + +Name: fwupdate +Version: 11 +Release: 3%{?dist} +Summary: Tools to manage UEFI firmware updates +License: GPLv2+ +URL: https://github.com/rhinstaller/fwupdate +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +BuildRequires: efivar-devel >= %{efivar_version} +BuildRequires: gnu-efi >= %{gnu_efi_version} +BuildRequires: gnu-efi-devel >= %{gnu_efi_version} +BuildRequires: pesign +BuildRequires: elfutils popt-devel git gettext pkgconfig +BuildRequires: systemd +BuildRequires: libabigail +%ifarch x86_64 +BuildRequires: libsmbios-devel +%endif +ExclusiveArch: x86_64 aarch64 +Source0: https://github.com/rhinstaller/fwupdate/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +Source1: find-debuginfo-efi.sh +Source2: securebootca.cer +Source3: secureboot.cer + +Patch0001: Fix-dependency-chain-for-a-parallel-make-issue.patch + +%global __os_install_post %{expand:\ + %{?__debug_package:%{__debug_install_post}} \ + %{SOURCE1} \ + %{__arch_install_post} \ + %{__os_install_post} \ + %{nil}}%{nil} + +%ifarch x86_64 +%global efiarch x64 +%global efialtarch ia32 +%endif +%ifarch aarch64 +%global efiarch aa64 +%endif + +# Figure out the right file path to use +%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')) + +%description +fwupdate provides a simple command line interface to the UEFI firmware updates. + +%package libs +Summary: Library to manage UEFI firmware updates +%ifnarch %{ix86} +Requires: shim +%endif +Requires: %{name}-efi = %{version}-%{release} + +%description libs +Library to allow for the simple manipulation of UEFI firmware updates. + +%package devel +Summary: Development headers for libfwup +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: efivar-devel >= %{efivar_version} + +%description devel +development headers required to use libfwup. + +%package efi +Summary: UEFI binaries used by libfwup +Requires: %{name}-libs = %{version}-%{release} + +%description efi +UEFI binaries used by libfwup. + +%package efi-debuginfo +Summary: debuginfo for UEFI binaries used by libfwup +Requires: %{name}-efi = %{version}-%{release} +AutoReq: 0 +AutoProv: 1 + +%description efi-debuginfo +debuginfo for UEFI binaries used by libfwup. + +%prep +%setup -q -n %{name}-%{version} +git init +git config user.email "%{name}-owner@fedoraproject.org" +git config user.name "Fedora Ninjas" +git add . +mkdir build-%{efiarch} +%ifarch x86_64 +mkdir build-%{efialtarch} +%endif +git commit -a -q -m "%{version} baseline." +git am %{patches} 11-3 +- Fix dependency chain issue when doing a parallel make + Related: rhbz#1677579 + +* Thu Feb 21 2019 Peter Jones 11-3 +- Fix secure boot signing for RHEL 8 + Resolves: rhbz#1677579 + +* Thu Feb 21 2019 Javier Martinez Canillas 11-2 +- Rebuild for signing with the proper key. + Resolves: rhbz#1677579 + +* Mon Apr 09 2018 Peter Jones - 11-1 +- Update to fwupdate 11 + +* Thu Mar 01 2018 Peter Jones - 10-6 +- Fix fwup.pc + +* Tue Feb 27 2018 Peter Jones - 10-5 +- Rebuild because I forgot to make sure efivar-34 was already in the + buildroot. + +* Tue Feb 27 2018 Peter Jones - 10-4 +- Roll in some bugfixes that'll be in fwupdate-11 upstream. + This helps fix a couple of vendors machines. + +* Wed Feb 07 2018 Fedora Release Engineering - 10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Peter Jones - 10-2 +- Make really sure everything in /boot/efi is 0700 so we don't conflict with + the grub packages. + +* Mon Jan 08 2018 Peter Jones - 10-1 +- Update to the final released version 10. +- Make everything under /boot/efi be mode 0700, since that's what FAT will + show anyway. + +* Tue Sep 12 2017 Peter Jones - 10-0.2 +- Update for version 10 +- test release for ux capsule support; to enable UX capsules define + LIBFWUP_ADD_UX_CAPSULE=1 in your environment. + +* Thu Aug 24 2017 Peter Jones - 9-0.2 +- Rebuild for aarch64 .reloc fix. + +* Tue Aug 22 2017 Peter Jones - 9-0.1 +- Update to fwupdate 9 +- Support ia32 + +* Wed Aug 02 2017 Fedora Release Engineering - 8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Peter Jones - 8-6 +- Try to make debuginfo generation work with rpm-4.13.0.1-38.fc27.x86_64 + +* Wed Jul 26 2017 Fedora Release Engineering - 8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jul 08 2017 Peter Jones - 8-4 +- Rebuild for efivar-31-1.fc26 + Related: rhbz#1468841 +- Fix some gcc 7 quirks + +* Fri Feb 10 2017 Fedora Release Engineering - 8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Sep 27 2016 Peter Jones - 8-2 +- Rebuild for efivar 30. + +* Fri Aug 19 2016 Peter Jones - 8-1 +- Update to fwupdate 8 +- Fix some i686 build errors +- Be less stupid about SONAMEs so in the future we'll only have to rebuild + dependent things on actual ABI changes. +- Only depend on libsmbios on x86, for now, because it hasn't been ported to + Aarch64. + +* Wed Aug 17 2016 Peter Jones - 7-1 +- Update to fwupdate 7 +- Fix the fix for ae7b85 +- fix one place where a second "rc" varibale is clobbering a result. + +* Tue Aug 16 2016 Peter Jones - 6-1 +- Update to fwupdate 6 +- lots of build fixes for newer compilers and such +- Use libsmbios on some systems to enable firmware updates (Mario Limonciello) +- Use the correct reset type from the QueryCapsuleInfo data +- Lots of fixes from auditing +- Use efivar's error reporting infrastructure + +* Fri Aug 12 2016 Adam Williamson - 0.5-5 +- backport a couple of commits to fix build against efivar 26 + +* Wed Feb 03 2016 Fedora Release Engineering - 0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Nov 18 2015 Peter Jones - 0.5-3 +- Temporarily don't require shim on i?86 - we've never built it there, and + libfwup knows how to handle it not being there just fine. + +* Wed Nov 18 2015 Peter Jones - 0.5-2 +- Fix missing -libs Requires: due to editing error + +* Wed Nov 18 2015 Peter Jones - 0.5-1 +- Rebase to 0.5 +- Highlights in 0.5: + - fwupdate.efi is called fwup$EFI_ARCH.efi now so weird platforms can have + them coexist. "Platform" here might mean "distro tools that care about + multilib". Anyway, it's needed to support things like baytrail. + - Worked around shim command line bug where we need to treat LOAD_OPTIONS + differently if we're invoked from the shell vs BDS + - various debug features - SHIM_DEBUG and FWUPDATE_VERBOSE UEFI variables + that'll let you get some debugging info some times + - oh yeah, the actual debuginfo is useful + - Automatically cleans up old instances on fresh OS installs + - valgrind --leak-check=full on fwupdate doesn't show any errors at all + - covscan shows only two things; one *really* doesn't matter, the other is + because it doesn't understand our firmware variable data structure and + can't work out that we have guaranteed the length of some data in a code + path it isn't considering. + - fwup_set_up_update() API improvements + - killed fwup_sterror() and friends entirely + - Should work on x64, ia32, and aarch64. + +* Wed Jun 17 2015 Fedora Release Engineering - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 02 2015 Peter Jones - 0.4-1 +- Update to 0.4 +- Set DESTDIR so it's more consistently respected +- Always use upper case for Boot#### names. +- Create abbreviated device paths for our BootNext entry. +- Make subdir Makefiles get the version right. +- Fix ucs2len() to handle max=-1 correctly. +- Compare the right blobs when we're searching old boot entries. +- Fix .efi generation on non-x86 platforms. +- Use a relative path for fwupdate.efi when launched from shim. +- Show fewer debugging messages. +- Set BootNext when we find an old Boot#### variable as well. +- Add fwup_get_fw_type(). + +* Mon Jun 01 2015 Peter Jones - 0.3-4 +- Make abbreviated device paths work in the BootNext entry. +- Fix a ucs2 parsing bug. + +* Mon Jun 01 2015 Peter Jones - 0.3-3 +- Always use abbreviated device paths for Boot#### entries. + +* Mon Jun 01 2015 Peter Jones - 0.3-2 +- Fix boot entry naming. + +* Thu May 28 2015 Peter Jones - 0.3-1 +- Here we go again. + +# vim:expandtab