diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e327dcf..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/fwupdate-*.tar.* -/clog -/*.rpm -/.build*.log -/*/ diff --git a/0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch b/0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch deleted file mode 100644 index 0ad2c34..0000000 --- a/0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch +++ /dev/null @@ -1,117 +0,0 @@ -From aeee5fbf54423a516780f06106f78ee28760bda8 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 2 May 2018 10:33:10 -0400 -Subject: [PATCH] Update arch names for gnu-efi-3.0.8-3.fc29 - -Signed-off-by: Peter Jones ---- - Make.defaults | 16 +++++++++++++--- - efi/.syntastic_c_config | 4 ++-- - efi/Makefile | 8 ++++---- - efi/{elf_aarch64_efi.lds => elf_aa64_efi.lds} | 0 - efi/{elf_x86_64_efi.lds => elf_x64_efi.lds} | 2 +- - 5 files changed, 20 insertions(+), 10 deletions(-) - rename efi/{elf_aarch64_efi.lds => elf_aa64_efi.lds} (100%) - rename efi/{elf_x86_64_efi.lds => elf_x64_efi.lds} (93%) - -diff --git a/Make.defaults b/Make.defaults -index 18b37955def..be0e1f2d890 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -20,8 +20,18 @@ ABIDW := abidw - prefix ?= /usr/ - prefix := $(abspath $(prefix)) - exec_prefix ?= $(prefix) --ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) --ifeq ($(ARCH),x86_64) -+ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed \ -+ -e s,i[3456789]86,ia32, \ -+ -e s,amd64,x64, -e s,x86_64,x64, \ -+ -e s,aarch64,aa64, \ -+ -e 's,armv7.*,arm,' \ -+ ) -+BFD_ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed \ -+ -e s,i[3456789]86,ia32, \ -+ -e s,amd64,x86_64, \ -+ -e 's,armv7.*,arm,' \ -+ ) -+ifeq ($(ARCH),x64) - LIBDIR ?= $(exec_prefix)/lib64 - ifeq "$(wildcard $(LIBDIR) )" "" - LIBDIR = $(exec_prefix)/lib/x86_64-linux-gnu -@@ -30,7 +40,7 @@ endif - ifeq ($(ARCH),ia32) - LIBDIR ?= $(exec_prefix)/lib - endif --ifeq ($(ARCH),aarch64) -+ifeq ($(ARCH),aa64) - LIBDIR ?= $(exec_prefix)/lib64 - endif - ifeq ($(ARCH),arm) -diff --git a/efi/.syntastic_c_config b/efi/.syntastic_c_config -index c212237ee10..25172a51780 100644 ---- a/efi/.syntastic_c_config -+++ b/efi/.syntastic_c_config -@@ -16,9 +16,9 @@ - -fno-stack-protector - -fno-stack-check - --std=gnu11 ---DCONFIG_x86_64 -+-DCONFIG_x64 - -I/usr/include/efi/ ---I/usr/include/efi/x86_64/ -+-I/usr/include/efi/x64/ - -iquote/home/pjones/devel/github.com/fwupdate/ux-capsule/include - -mno-mmx - -mno-sse -diff --git a/efi/Makefile b/efi/Makefile -index 635c4571e6a..f92b1aa2b6e 100644 ---- a/efi/Makefile -+++ b/efi/Makefile -@@ -35,22 +35,22 @@ OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24) - - FWUP = fwupdate - --ifeq ($(ARCH),x86_64) -- FORMAT = --target efi-app-$(ARCH) -+ifeq ($(ARCH),x64) -+ FORMAT = --target efi-app-$(BFD_ARCH) - BUILDFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \ - $(CLANG_BUGS) -DEFI_FUNCTION_WRAPPER \ - -DGNU_EFI_USE_MS_ABI -I$(shell $(CC) -print-file-name=include) - FWUP = fwupx64 - endif - ifeq ($(ARCH),ia32) -- FORMAT = --target efi-app-$(ARCH) -+ FORMAT = --target efi-app-$(BFD_ARCH) - BUILDFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \ - $(CLANG_BUGS) -m32 \ - -I$(shell $(CC) -print-file-name=include) - FWUP = fwupia32 - endif - --ifeq ($(ARCH),aarch64) -+ifeq ($(ARCH),aa64) - FORMAT = -O binary - CCLDFLAGS += -Wl,--defsym=EFI_SUBSYSTEM=0xa - BUILDFLAGS += -ffreestanding -I$(shell $(CC) -print-file-name=include) -diff --git a/efi/elf_aarch64_efi.lds b/efi/elf_aa64_efi.lds -similarity index 100% -rename from efi/elf_aarch64_efi.lds -rename to efi/elf_aa64_efi.lds -diff --git a/efi/elf_x86_64_efi.lds b/efi/elf_x64_efi.lds -similarity index 93% -rename from efi/elf_x86_64_efi.lds -rename to efi/elf_x64_efi.lds -index 73a79e7d8b0..9b254b0085f 100644 ---- a/efi/elf_x86_64_efi.lds -+++ b/efi/elf_x64_efi.lds -@@ -1,4 +1,4 @@ --/* Same as elf_x86_64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */ -+/* Same as elf_x64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */ - OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") - OUTPUT_ARCH(i386:x86-64) - ENTRY(_start) --- -2.14.3 - diff --git a/README.md b/README.md deleted file mode 100644 index 8bb4830..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -Please direct issues and pull requests to [upstream](https://github.com/rhboot/fwupdate). diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..53fb124 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +fwupdate fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674914 diff --git a/find-debuginfo-efi.sh b/find-debuginfo-efi.sh deleted file mode 100755 index b6198f5..0000000 --- a/find-debuginfo-efi.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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/fwupdate.spec b/fwupdate.spec deleted file mode 100644 index 99ef945..0000000 --- a/fwupdate.spec +++ /dev/null @@ -1,344 +0,0 @@ -%global efivar_version 35-3 -%global efibootmgr_version 16-3 -%global gnu_efi_version 3.0.8-4 -%global efi_macros_version 3-2 -%undefine _debuginfo_subpackages - -Name: fwupdate -Version: 11 -Release: 6%{?dist} -Summary: Tools to manage UEFI firmware updates -License: GPLv2+ -URL: https://github.com/rhboot/fwupdate -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: efi-filesystem -BuildRequires: gcc -BuildRequires: efi-srpm-macros >= %{efi_macros_version} -BuildRequires: efi-filesystem -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: %{efi} -ExcludeArch: %{arm} -Source0: https://github.com/rhboot/fwupdate/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 -Source1: find-debuginfo-efi.sh -Patch0001: 0001-Update-arch-names-for-gnu-efi-3.0.8-3.fc29.patch - -%global __os_install_post %{expand:\ - %{?__debug_package:%{__debug_install_post}} \ - %{SOURCE1} \ - %{__arch_install_post} \ - %{__os_install_post} \ - %{nil}}%{nil} - -%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 -%autosetup -S git -mkdir build-%{efi_arch} -%if %{efi_has_alt_arch} - mkdir build-%{efi_alt_arch} -%endif -git config --local --add fwupdate.efidir %{efi_vendor} - -%build -cd build-%{efi_arch} -%make_build -f ../Makefile \ - TOPDIR=.. OPT_FLAGS="$RPM_OPT_FLAGS" \ - libdir=%{_libdir} bindir=%{_bindir} \ - EFIDIR=%{efi_vendor} -mv -v efi/fwup%{efi_arch}.efi efi/fwup%{efi_arch}.unsigned.efi -%pesign -s -i efi/fwup%{efi_arch}.unsigned.efi -o efi/fwup%{efi_arch}.efi -cd .. - -%if %{efi_has_alt_arch} - cd build-%{efi_alt_arch} - setarch linux32 -B %make_build -f ../Makefile \ - TOPDIR=.. ARCH=%{efi_alt_arch} \ - OPT_FLAGS="$RPM_OPT_FLAGS" \ - libdir=%{_libdir} bindir=%{_bindir} \ - EFIDIR=%{efi_vendor} - mv -v efi/fwup%{efi_alt_arch}.efi efi/fwup%{efi_alt_arch}.unsigned.efi - %pesign -s -i efi/fwup%{efi_alt_arch}.unsigned.efi -o efi/fwup%{efi_alt_arch}.efi - cd .. -%endif - -%install -rm -rf $RPM_BUILD_ROOT -cd build-%{efi_arch} -%make_install -f ../Makefile \ - TOPDIR=.. RPMARCH=%{_arch} RELEASE=%{RELEASE} \ - libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \ - localedir=%{_datadir}/locale/ includedir=%{_includedir} \ - libexecdir=%{_libexecdir} datadir=%{_datadir} \ - sharedstatedir=%{_sharedstatedir} -cd .. - -%if %{efi_has_alt_arch} - cd build-%{efi_alt_arch} - setarch linux32 -B %make_install -f ../Makefile \ - ARCH=%{efi_alt_arch} TOPDIR=.. \ - EFIDIR=%{efi_vendor} RPMARCH=%{_arch} \ - RELEASE=%{RELEASE} libdir=%{_libdir} \ - bindir=%{_bindir} mandir=%{_mandir} \ - localedir=%{_datadir}/locale/ \ - includedir=%{_includedir} \ - libexecdir=%{_libexecdir} \ - datadir=%{_datadir} \ - sharedstatedir=%{_sharedstatedir} - cd .. -%endif - -%post libs -/sbin/ldconfig -%systemd_post fwupdate-cleanup.service - -%preun libs -%systemd_preun fwupdate-cleanup.service - -%postun libs -/sbin/ldconfig -%systemd_postun_with_restart pesign.service - -%check -%ifarch x86_64 -make abicheck -%endif - -%files -%{!?_licensedir:%global license %%doc} -%license COPYING -# %%doc README -%{_bindir}/fwupdate -%{_datadir}/locale/en/fwupdate.po -%doc %{_mandir}/man1/* -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/fwupdate - -%files devel -%doc %{_mandir}/man3/* -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc - -%files libs -%{_libdir}/*.so.* -%{_datadir}/locale/en/libfwup.po -%{_unitdir}/fwupdate-cleanup.service -%attr(0755,root,root) %dir %{_sharedstatedir}/fwupdate/ -%config(noreplace) %ghost %{_sharedstatedir}/fwupdate/done -%attr(0755,root,root) %dir %{_libexecdir}/fwupdate/ -%{_libexecdir}/fwupdate/cleanup - -%files efi -%dir %attr(0700,root,root) %{efi_esp_dir}/fw/ -%attr (0700,root,root) %{efi_esp_dir}/fwup%{efi_arch}.efi -%if %{efi_has_alt_arch} -%attr (0700,root,root) %{efi_esp_dir}/fwup%{efi_alt_arch}.efi -%endif - -%files efi-debuginfo -f debugfiles-efi.list - -%changelog -* Thu Jul 25 2019 Fedora Release Engineering - 11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Aug 08 2018 Peter Jones - 11-4 -- Fix the completely broken -3 build that shouldn't have been allowed at - all. - -* Fri Jul 13 2018 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue May 01 2018 Peter Jones - 11-2 -- Use efi-rpm-macros instead of defining all the efi macros ourselves - -* 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 diff --git a/sources b/sources deleted file mode 100644 index c828ad0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (fwupdate-11.tar.bz2) = ecf1225730f9769dcb631dd94113d2346e82df4806e23aef77441f946855f9eda7083cd51ab0af24a36f90a27661191c1802caa1c4bbbab863c0b194837d7d97