Hello community, here is the log from the commit of package fwupdate for openSUSE:Factory checked in at 2017-11-20 17:06:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwupdate (Old) and /work/SRC/openSUSE:Factory/.fwupdate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwupdate" Mon Nov 20 17:06:23 2017 rev:5 rq:542976 version:9+git21.gcd8f7d7 Changes: -------- --- /work/SRC/openSUSE:Factory/fwupdate/fwupdate.changes 2017-04-11 09:36:11.641101763 +0200 +++ /work/SRC/openSUSE:Factory/.fwupdate.new/fwupdate.changes 2017-11-20 17:07:10.825908430 +0100 @@ -1,0 +2,22 @@ +Mon Nov 20 03:10:06 UTC 2017 - [email protected] + +- Add back fwupdate-bsc988886-add-leading-space.patch due to the + long pending shim signature request. Also drop the shim version + requirement. + +------------------------------------------------------------------- +Tue Aug 29 10:24:16 UTC 2017 - [email protected] + +- Update to 9+git21.gcd8f7d7 (FATE#322805) +- Add the new BuildRequires: libsmbios-devel +- Update the so version of libfwup +- Refresh fwupdate-suse-build.patch +- Remove the upstream patches + + fwupdate-fix-efivar-0.24-api.patch + + fwupdate-bsc988000-set-a-mode-with-efi_set_variable.patch + + fwupdate-unset-immutable-flag.patch +- Drop fwupdate-bsc988886-add-leading-space.patch (Need shim >= 11) +- Add fwupdate-list-firmware-types.patch to list the supported + firmware types + +------------------------------------------------------------------- Old: ---- fwupdate-0.5.tar.bz2 fwupdate-bsc988000-set-a-mode-with-efi_set_variable.patch fwupdate-fix-efivar-0.24-api.patch fwupdate-unset-immutable-flag.patch New: ---- fwupdate-9+git21.gcd8f7d7.tar.bz2 fwupdate-list-firmware-types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwupdate.spec ++++++ --- /var/tmp/diff_new_pack.7eKSAg/_old 2017-11-20 17:07:11.653878454 +0100 +++ /var/tmp/diff_new_pack.7eKSAg/_new 2017-11-20 17:07:11.653878454 +0100 @@ -18,30 +18,29 @@ Name: fwupdate -Version: 0.5 +Version: 9+git21.gcd8f7d7 Release: 0 Summary: Tools to manage UEFI firmware updates License: GPL-2.0+ Group: System/Base Url: https://github.com/rhinstaller/fwupdate -Source: https://github.com/rhinstaller/fwupdate/releases/download/0.5/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-suse-build.patch -Patch1: %{name}-bsc988000-set-a-mode-with-efi_set_variable.patch -Patch2: %{name}-fix-efivar-0.24-api.patch -Patch3: %{name}-unset-immutable-flag.patch -Patch4: %{name}-bsc988886-add-leading-space.patch -BuildRequires: efivar-devel >= 0.21 +Patch1: %{name}-list-firmware-types.patch +Patch2: %{name}-bsc988886-add-leading-space.patch +BuildRequires: efivar-devel >= 0.24 BuildRequires: elfutils BuildRequires: fdupes BuildRequires: gettext BuildRequires: gnu-efi >= 3.0.2 +BuildRequires: libsmbios-devel BuildRequires: pesign-obs-integration BuildRequires: pkg-config BuildRequires: popt-devel BuildRequires: systemd-rpm-macros Requires: %{name}-efi Requires: efibootmgr -Requires: libfwup0 = %{version}-%{release} +Requires: libfwup1 = %{version}-%{release} Requires: shim %{?systemd_requires} ExclusiveArch: x86_64 %{ix86} @@ -55,11 +54,11 @@ %description fwupdate provides a simple command line interface to the UEFI firmware updates. -%package -n libfwup0 +%package -n libfwup1 Summary: Library to manage UEFI firmware updates Group: System/Libraries -%description -n libfwup0 +%description -n libfwup1 Library to allow for the simple manipulation of UEFI firmware updates. %package devel @@ -67,7 +66,7 @@ Group: Development/Libraries/Other Requires: efivar-devel >= 0.21 Requires: fwupdate = %{version}-%{release} -Requires: libfwup0 = %{version}-%{release} +Requires: libfwup1 = %{version}-%{release} %description devel development headers required to use libfwup. @@ -84,21 +83,19 @@ %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -if [ "$(pkg-config --modversion efivar)" > "0.23" ]; then %patch2 -p1 -fi -%patch3 -p1 -%patch4 -p1 %build -make OPT_FLAGS="$RPM_OPT_FLAGS" libdir=%{_libdir} bindir=%{_bindir} \ - EFIDIR=%{efidir} GNUEFIDIR=%{_libdir} %{?_smp_mflags} +make PJONES="$RPM_OPT_FLAGS" libdir=%{_libdir} bindir=%{_bindir} \ + EFIDIR=%{efidir} GNUEFIDIR=%{_libdir} TARGETDIR=%{_libdir}/efi \ + %{?_smp_mflags} %install export BRP_PESIGN_FILES='%{_libdir}/efi/fwup*.efi' %make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \ localedir=%{_datadir}/locale/ includedir=%{_includedir} \ - libexecdir=%{_libexecdir} datadir=%{_datadir} EFIDIR=%{efidir} + libexecdir=%{_libexecdir} datadir=%{_datadir} EFIDIR=%{efidir} \ + TARGETDIR=%{_libdir}/efi echo 0%{?_build_create_debug} %if 0%{?_build_create_debug} == 0 @@ -124,9 +121,9 @@ %postun %service_del_postun fwupdate-cleanup.service -%post -n libfwup0 -p /sbin/ldconfig +%post -n libfwup1 -p /sbin/ldconfig -%postun -n libfwup0 -p /sbin/ldconfig +%postun -n libfwup1 -p /sbin/ldconfig %post -n %{name}-efi # Create the directory for the firwmare update capsule @@ -161,7 +158,7 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%files -n libfwup0 +%files -n libfwup1 %defattr(-,root,root) %{_libdir}/*.so.* ++++++ fwupdate-bsc988886-add-leading-space.patch ++++++ --- /var/tmp/diff_new_pack.7eKSAg/_old 2017-11-20 17:07:11.677877586 +0100 +++ /var/tmp/diff_new_pack.7eKSAg/_new 2017-11-20 17:07:11.677877586 +0100 @@ -12,11 +12,11 @@ linux/libfwup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/linux/libfwup.c b/linux/libfwup.c -index bae1e63..a94f8d6 100644 ---- a/linux/libfwup.c -+++ b/linux/libfwup.c -@@ -665,6 +665,7 @@ set_up_boot_next(void) +Index: fwupdate-9+git21.gcd8f7d7/linux/libfwup.c +=================================================================== +--- fwupdate-9+git21.gcd8f7d7.orig/linux/libfwup.c ++++ fwupdate-9+git21.gcd8f7d7/linux/libfwup.c +@@ -859,6 +859,7 @@ set_up_boot_next(void) char *shim_fs_path = NULL; char *fwup_fs_path = NULL; char *fwup_esp_path = NULL; @@ -24,8 +24,8 @@ int use_fwup_path = 0; char *label = NULL; -@@ -690,7 +691,10 @@ set_up_boot_next(void) - goto out; +@@ -894,7 +895,10 @@ set_up_boot_next(void) + } if (!use_fwup_path) { - loader_str = utf8_to_ucs2((uint8_t *)fwup_esp_path, -1); @@ -36,6 +36,3 @@ loader_sz = ucs2len(loader_str, -1) * 2; if (loader_sz) loader_sz += 2; --- -2.9.0 - ++++++ fwupdate-list-firmware-types.patch ++++++ >From 2ddfb331280ddcb8e42ed74d3640eac509427548 Mon Sep 17 00:00:00 2001 From: Ivan Hu <[email protected]> Date: Thu, 22 Jun 2017 13:16:40 +0800 Subject: [PATCH] show type on listing suppored firmware updates Also show type when list supported firmware updates, help users to distinguish which GUID they would like to use. Signed-off-by: Ivan Hu <[email protected]> --- linux/fwupdate.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/linux/fwupdate.c b/linux/fwupdate.c index eaf07be..1df0acd 100644 --- a/linux/fwupdate.c +++ b/linux/fwupdate.c @@ -50,6 +50,8 @@ print_system_resources(void) char *id_guid = NULL; uint32_t vers; uint32_t lowest; + uint32_t type; + char *str_type; fwup_get_guid(re, &guid); rc = efi_guid_to_id_guid(guid, &id_guid); @@ -60,9 +62,27 @@ print_system_resources(void) fwup_get_fw_version(re, &vers); fwup_get_lowest_supported_fw_version(re, &lowest); + fwup_get_fw_type(re, &type); + switch (type) { + case FWUP_RESOURCE_TYPE_UNKNOWN: + str_type = "Unknown"; + break; + case FWUP_RESOURCE_TYPE_SYSTEM_FIRMWARE: + str_type = "System Firmware"; + break; + case FWUP_RESOURCE_TYPE_DEVICE_FIRMWARE: + str_type = "Device Firmware"; + break; + case FWUP_RESOURCE_TYPE_UEFI_DRIVER: + str_type = "UEFI Driver"; + break; + default: + str_type = ""; + break; + } - printf(_("%s version %d can be updated to any version above %d\n"), - id_guid, vers, lowest-1); + printf(_("%s type, %s version %d can be updated to any version above %d\n"), + str_type , id_guid, vers, lowest-1); free(id_guid); } -- 2.14.1 ++++++ fwupdate-suse-build.patch ++++++ --- /var/tmp/diff_new_pack.7eKSAg/_old 2017-11-20 17:07:11.689877151 +0100 +++ /var/tmp/diff_new_pack.7eKSAg/_new 2017-11-20 17:07:11.693877006 +0100 @@ -1,108 +1,45 @@ -From d8606481171c167e6ec50de5ed630f19d4622182 Mon Sep 17 00:00:00 2001 -From: Gary Lin <[email protected]> -Date: Wed, 2 Dec 2015 16:10:08 +0800 -Subject: [PATCH 1/3] Install programs the SUSE way - -Also avoid installing po files. ---- - Make.defaults | 2 +- - linux/Makefile | 1 - - linux/cleanup.in | 4 ++-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Make.defaults b/Make.defaults -index 912a893..b8dd67f 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -39,4 +39,4 @@ libdatadir ?= $(prefix)lib/ - EFIDIR ?= redhat - DEBUGINFO ?= $(prefix)lib/debug/ - DEBUGSOURCE ?= $(prefix)src/debug/ --TARGETDIR ?= /boot/efi/EFI/$(EFIDIR)/ -+TARGETDIR ?= ${libdir}/efi/ -diff --git a/linux/Makefile b/linux/Makefile -index 5821467..a6839c6 100644 ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -86,7 +86,6 @@ install : all - $(INSTALL) -d -m 755 $(DESTDIR)/$(includedir)/ - $(INSTALL) -m 644 $(INCTARGETS) $(DESTDIR)/$(includedir)/ - $(INSTALL) -d -m 755 $(DESTDIR)/$(localedir)/en/ -- $(INSTALL) -m 644 $(POTARGETS) $(DESTDIR)/$(localedir)/en/ - $(INSTALL) -d -m 755 $(DESTDIR)/$(bindir) - $(foreach x, $(BINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)/$(bindir);) - $(foreach x, $(wildcard *.so.$(VERSION)), ln -fs $(x) $(patsubst %.so.$(VERSION),%.so,$(DESTDIR)/$(libdir)/$(x)); ln -fs $(x) $(patsubst %.so.$(VERSION),%.so.$(MAJOR_VERSION),$(DESTDIR)/$(libdir)/$(x));) -diff --git a/linux/cleanup.in b/linux/cleanup.in -index 10fdc8a..5d3bd8b 100755 ---- a/linux/cleanup.in -+++ b/linux/cleanup.in +Index: fwupdate-9+git21.gcd8f7d7/linux/cleanup.in +=================================================================== +--- fwupdate-9+git21.gcd8f7d7.orig/linux/cleanup.in ++++ fwupdate-9+git21.gcd8f7d7/linux/cleanup.in @@ -1,6 +1,6 @@ #!/bin/sh set -e --if [ -e "@@DATADIR@@fwupdate/done" ]; then +-if [ -e "@@DATADIR@@/fwupdate/done" ]; then +if [ -e "/run/fwupdate/done" ]; then exit 0 fi -@@ -23,4 +23,4 @@ for x in /sys/firmware/efi/efivars/fwupdate-*-0abba7dc-e516-4167-bbf5-4d9d1c7394 +@@ -26,4 +26,4 @@ for x in /sys/firmware/efi/efivars/fwupd fi done -touch "@@DATADIR@@/fwupdate/done" +touch "/run/fwupdate/done" --- -2.9.0 - - -From 2c370b0e68ce125e7e50f1406a3d9233aee789b5 Mon Sep 17 00:00:00 2001 -From: Gary Lin <[email protected]> -Date: Wed, 13 Jul 2016 17:59:34 +0800 -Subject: [PATCH 2/3] Skip the installation of the build-id of fwup*.efi - ---- - efi/Makefile | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/efi/Makefile b/efi/Makefile -index 8a3c6bd..8c44309 100644 ---- a/efi/Makefile -+++ b/efi/Makefile -@@ -99,9 +99,6 @@ define inst = - $(INSTALL) -m 755 $(1) $(DESTDIR)$(TARGETDIR)$(1) - $(INSTALL) -d -m 755 $(DESTDIR)$(DEBUGINFO)$(TARGETDIR) +Index: fwupdate-9+git21.gcd8f7d7/efi/Makefile +=================================================================== +--- fwupdate-9+git21.gcd8f7d7.orig/efi/Makefile ++++ fwupdate-9+git21.gcd8f7d7/efi/Makefile +@@ -111,9 +111,6 @@ define inst = + $(INSTALL) -m 755 $(1) $(DESTDIR)$(TARGETDIR)/$(1) + $(INSTALL) -d -m 755 $(DESTDIR)$(DEBUGINFO)$(TARGETDIR)/ $(INSTALL) -m 755 $(1).debug $(DESTDIR)$(DEBUGINFO)$(TARGETDIR)/$(1).debug -- $(INSTALL) -d -m 755 $(DESTDIR)$(DEBUGINFO).build-id/$(dir $(shell cat $(1).build-id)) -- ln -sf ../../../../..$(TARGETDIR)$(1) $(DESTDIR)$(DEBUGINFO).build-id/$(shell cat $(1).build-id) -- ln -sf ../..$(TARGETDIR)$(1).debug $(DESTDIR)$(DEBUGINFO).build-id/$(shell cat $(1).build-id).debug +- $(INSTALL) -d -m 755 $(DESTDIR)$(DEBUGINFO)/.build-id/$(dir $(shell cat $(1).build-id)) +- ln -sf ../../../../..$(TARGETDIR)$(1) $(DESTDIR)$(DEBUGINFO)/.build-id/$(shell cat $(1).build-id) +- ln -sf ../..$(TARGETDIR)$(1).debug $(DESTDIR)$(DEBUGINFO)/.build-id/$(shell cat $(1).build-id).debug endef - install : $(FWUP).efi | $(FWUP).efi.debug $(FWUP).efi.build-id --- -2.9.0 - - -From 7527c30b3139acf9bbf2205243ee7a73169bf753 Mon Sep 17 00:00:00 2001 -From: Gary Lin <[email protected]> -Date: Fri, 15 Jul 2016 11:40:24 +0800 -Subject: [PATCH 3/3] Use the OPT_FLAGS for the user space programs - ---- - linux/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/Makefile b/linux/Makefile -index a6839c6..7c9fec1 100644 ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -5,7 +5,7 @@ include $(TOPDIR)/Make.defaults - LIB_LIBS= pthread - BIN_LIBS= popt pthread - PKLIBS = efivar efiboot --CFLAGS ?= -g -O0 -+CFLAGS ?= $(OPT_FLAGS) - PJONES = - BIN_CCLDFLAGS = $(foreach lib,$(BIN_LIBS),-l$(lib)) \ - $(foreach pklib,$(PKLIBS), \ --- -2.9.0 - + install : | check_efidir_error +Index: fwupdate-9+git21.gcd8f7d7/linux/Makefile +=================================================================== +--- fwupdate-9+git21.gcd8f7d7.orig/linux/Makefile ++++ fwupdate-9+git21.gcd8f7d7/linux/Makefile +@@ -102,8 +102,6 @@ install : check_efidir_error all + $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(pcdir) ;) + $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/ + $(INSTALL) -m 644 $(INCTARGETS) $(DESTDIR)$(includedir)/ +- $(INSTALL) -d -m 755 $(DESTDIR)$(localedir)/en/ +- $(INSTALL) -m 644 $(POTARGETS) $(DESTDIR)$(localedir)/en/ + $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)/ + $(foreach x, $(BINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(bindir);) + $(foreach x, $(wildcard *.so.1.$(VERSION)), \
