Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package efivar for openSUSE:Factory checked in at 2023-03-16 22:57:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efivar (Old) and /work/SRC/openSUSE:Factory/.efivar.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efivar" Thu Mar 16 22:57:12 2023 rev:22 rq:1072154 version:38 Changes: -------- --- /work/SRC/openSUSE:Factory/efivar/efivar.changes 2022-08-11 18:31:22.714129712 +0200 +++ /work/SRC/openSUSE:Factory/.efivar.new.31432/efivar.changes 2023-03-16 22:57:14.639138825 +0100 @@ -1,0 +2,54 @@ +Fri Feb 10 07:21:31 UTC 2023 - Gary Ching-Pang Lin <[email protected]> + +- Update to 38 + + Rework some makefile bits to make overriding some options + simpler + + Handle /sys/devices/virtual/{nvme-fabrics,nvme-subsystem} + devices + + guids.S: Include <cet.h> when CET is enabled + + Fix /sys/block sysfs parsing for eMMC-s + + Properly check mmap return error + + Fix s{yt,ty}le typo in efi_get_variable(3) + + Handle NULL set_variable() + + Fix parsing for nvme-subsystem devices + + Attempt to fix the identified thread safety bugs + + Make thread-test depend on libefivar.so + + Upstream a local patch from rawhide + + Fix conversion from UTF8 to UCS2 + + efivar: make docs match current code for 'efivar -A' + + Add code of conduct + + Misc minor fixes + + Add efi_time_t declarations and helper functions + + More misc fixes + + Coverity fixes 20211208 + + Fix linux virtual root device parsing + + efivar.spec.in: fix license to be valid SPDX + + Add efisecdb tooling + + Fix linker string comparison for dash +- Add efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch + to remove the ld script hack for efi_well_known_* variables + that caused build failure with LTO (bsc#1206388) +- Add mandoc to BuildRequires to build efisecdb man page +- Add efivar-adjust-dependency.patch to avoid 'make install' from + building the binaries again +- Add efivar-filter-gcc-march.patch to drop '-march=native' from + HOST_CPPFLAGS for ppc64le and riscv64 due to the absence of the + gcc parameter +- Refresh libefiboot-export-disk_get_partition_info.patch + + Cast (uint8_t *) signature to (partition_signature_t *) + + Update src/libefiboot.map.in +- Remove upstreamed patches + + efivar-Fix-all-the-places-Werror-address-of-packed-member-c.patch + + efivar-bsc1127544-fix-ucs2len.patch + + efivar-bsc1175989-handle-NULL-set-variable.patch + + efivar-bsc1181967-fix-nvme-parsing.patch + + efivar-bsc1187386-fix-emmc-parsing.patch + + efivar-fix-efidp_ipv4_addr-fields-assignment.patch + + efivar-make-format_guid-handle-misaligned-guid-pointer.patch + +------------------------------------------------------------------- +Wed Dec 21 18:58:32 UTC 2022 - Callum Farmer <[email protected]> + +- Update spec file to current standards + +------------------------------------------------------------------- Old: ---- efivar-37.tar.bz2 efivar-Fix-all-the-places-Werror-address-of-packed-member-c.patch efivar-bsc1127544-fix-ucs2len.patch efivar-bsc1175989-handle-NULL-set-variable.patch efivar-bsc1181967-fix-nvme-parsing.patch efivar-bsc1187386-fix-emmc-parsing.patch efivar-fix-efidp_ipv4_addr-fields-assignment.patch efivar-make-format_guid-handle-misaligned-guid-pointer.patch New: ---- efivar-38.tar.bz2 efivar-adjust-dependency.patch efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch efivar-filter-gcc-march.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efivar.spec ++++++ --- /var/tmp/diff_new_pack.RBT3bm/_old 2023-03-16 22:57:15.451142758 +0100 +++ /var/tmp/diff_new_pack.RBT3bm/_new 2023-03-16 22:57:15.455142778 +0100 @@ -1,7 +1,7 @@ # # spec file for package efivar # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,9 @@ # -%if 0%{?suse_version} <= 1320 - # Allow building on older products (SLE11SP4, SLES12, and Leap 42.2) - %define gcc 5 - %define gcc_v %{gcc} - %if 120200 <= 0%{?sle_version} && 0%{?sle_version} < 130000 - %define gcc 6 - %define gcc_v %{gcc} - %endif -%endif %define major 1 - Name: efivar -Version: 37 +Version: 38 Release: 0 Summary: Tools to manage UEFI variables License: LGPL-2.1-only @@ -36,26 +26,14 @@ URL: https://github.com/rhinstaller/efivar Source: https://github.com/rhinstaller/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2 Patch0: libefiboot-export-disk_get_partition_info.patch -# PATCH-FIX-UPSTREAM boo#1120862 -Patch1: efivar-make-format_guid-handle-misaligned-guid-pointer.patch -# PATCH-FIX-UPSTREAM boo#1120862 -Patch2: efivar-Fix-all-the-places-Werror-address-of-packed-member-c.patch -Patch3: efivar-bsc1127544-fix-ucs2len.patch -Patch4: efivar-fix-efidp_ipv4_addr-fields-assignment.patch -Patch5: efivar-bsc1175989-handle-NULL-set-variable.patch -Patch6: efivar-bsc1181967-fix-nvme-parsing.patch -Patch7: efivar-bsc1187386-fix-emmc-parsing.patch -Patch8: efivar-bsc1202209-fix-glibc-2.36-build.patch -%if "0%{?buildroot}" == "0" -# set a sane value for buildroot, unless it's already there! -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif +Patch1: efivar-bsc1202209-fix-glibc-2.36-build.patch +Patch2: efivar-adjust-dependency.patch +Patch3: efivar-filter-gcc-march.patch +Patch4: efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch BuildRequires: fdupes -BuildRequires: pkg-config -BuildRequires: popt-devel -%if 0%{?gcc} != 0 -BuildRequires: gcc%{gcc} -%endif +BuildRequires: mandoc +BuildRequires: pkgconfig +BuildRequires: pkgconfig(popt) Requires: libefivar%{major} = %{version}-%{release} %description @@ -77,25 +55,7 @@ Development headers required to use libefivar. %prep -%setup -q -%patch0 -p1 -%if 0%{?suse_version} == 1110 -# Instead of conditional patching: -# - 'popt.pc' missing in 'popt-devel' on SLE11 -perl -pi -e 's{^.*PKGS=popt.*$}{}; s{^(efivar\S* : LIBS=.*)dl}{$1popt dl}' \ - src/Makefile -# - 'uchar.h' missing in both 'glibc-devel' and 'gcc-5' packages on SLE11 -perl -pi -e 's{\#include \<uchar\.h\>}{typedef __CHAR16_TYPE__ char16_t;}' \ - src/export.c -%endif -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%autosetup -p1 %build CFLAGS="%{optflags} -Wno-nonnull -flto" @@ -105,45 +65,33 @@ export CFLAGS export LDFLAGS="-flto-partition=one" -make \ -%if 0%{?gcc_v} != 0 - CC=gcc-%{gcc_v} \ - AR=gcc-ar-%{gcc_v} \ - NM=gcc-nm-%{gcc_v} \ - RANLIB=gcc-ranlib-%{gcc_v} \ -%endif - libdir=%{_libdir} \ - bindir=%{_bindir} +%make_build %install -make DESTDIR=%{buildroot} \ +%make_install \ libdir=%{_libdir} \ - bindir=%{_bindir} \ - install + bindir=%{_bindir} + %fdupes -s %{buildroot} # fail on undercover ABI changes file %{buildroot}/%{_libdir}/lib%{name}.so.%{major}* -%post -n libefivar%{major} -p /sbin/ldconfig - -%postun -n libefivar%{major} -p /sbin/ldconfig +%ldconfig_scriptlets -n libefivar%{major} %files -%defattr(-,root,root) %license COPYING %{_bindir}/efivar +%{_bindir}/efisecdb %{_mandir}/man1/* %files devel -%defattr(-,root,root) %{_mandir}/man3/* %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %files -n libefivar%{major} -%defattr(-,root,root) %{_libdir}/*.so.* %changelog ++++++ efivar-37.tar.bz2 -> efivar-38.tar.bz2 ++++++ ++++ 36809 lines of diff (skipped) ++++++ efivar-adjust-dependency.patch ++++++ >From 26ad6858b7ca2093677a8a13d367436f5c1a22fe Mon Sep 17 00:00:00 2001 From: Mike Gilbert <[email protected]> Date: Mon, 17 Jan 2022 11:42:53 -0500 Subject: [PATCH] Adjust dependency for libefivar and libefiboot objects Depending on 'prep' causes all objects to be rebuilt every time 'make' is invoked. Depending on '$(GENERATED_SOURCES)' causes a build failure because guid-symbols.c gets passed to the compiler due to a rule in rules.mk. Depend on 'include/efivar/efivar-guids.h' directly to avoid these issues. Fixes: https://github.com/rhboot/efivar/issues/199 Signed-off-by: Mike Gilbert <[email protected]> --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index a86abdc..e04357a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -88,7 +88,7 @@ $(MAKEGUIDS_OUTPUT) : guids.txt prep : makeguids $(GENERATED_SOURCES) -$(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : prep +$(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : include/efivar/efivar-guids.h libefivar.a : | $(GENERATED_SOURCES) libefivar.a : $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS)) -- 2.35.3 ++++++ efivar-bsc1206388-revamp-efi_well_known-variable-handling.patch ++++++ >From 06a27de4468c879494db0e34d37b4ad2e5788af4 Mon Sep 17 00:00:00 2001 From: Nicholas Vinson <[email protected]> Date: Mon, 10 Oct 2022 14:22:36 -0400 Subject: [PATCH] Revamp efi_well_known_* variable handling The current implementation attempts to use the linker to create aliases for efi_well_known_guids and efi_well_known_names. It also tries to use the linker to generate the variables efi_well_known_guids_end and efi_well_known_names_end. When building with clang, the generated linker result results in a broken libefivar.so that causes programs to segfault when linked against it. This change does away with linker script hacker and instead introduces pointers to store the locations of efi_well_known_guids_end and efi_well_known_names_end. Additionally, efi_well_known_guids and efi_well_known_names are now created as pointers that point to the beginning of their respective arrays. Signed-off-by: Nicholas Vinson <[email protected]> Fixes: #234 --- src/Makefile | 7 ++-- src/include/rules.mk | 5 +-- src/include/workarounds.mk | 24 ------------- src/makeguids.c | 72 +++++++++++++------------------------- 4 files changed, 27 insertions(+), 81 deletions(-) delete mode 100644 src/include/workarounds.mk diff --git a/src/Makefile b/src/Makefile index 0e423c4..a655a56 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,6 @@ include $(TOPDIR)/src/include/deprecated.mk include $(TOPDIR)/src/include/version.mk include $(TOPDIR)/src/include/rules.mk include $(TOPDIR)/src/include/defaults.mk -include $(TOPDIR)/src/include/workarounds.mk LIBTARGETS=libefivar.so libefiboot.so libefisec.so STATICLIBTARGETS=libefivar.a libefiboot.a libefisec.a @@ -30,7 +29,7 @@ EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES))) GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c MAKEGUIDS_SOURCES = makeguids.c util.c MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES))) -MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) guids.lds +MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \ $(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \ @@ -81,7 +80,7 @@ $(MAKEGUIDS_OUTPUT) : guids.txt if [ "$${missing}" != "no" ]; then \ exit 1 ; \ fi - ./makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds + ./makeguids guids.txt guid-symbols.c include/efivar/efivar-guids.h prep : makeguids $(GENERATED_SOURCES) @@ -93,7 +92,6 @@ libefivar.a : $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS)) libefivar.so : $(LIBEFIVAR_OBJECTS) libefivar.so : | $(GENERATED_SOURCES) libefivar.map libefivar.so : LIBS=dl -libefivar.so : LDSCRIPTS=guids.lds libefivar.so : MAP=libefivar.map efivar : $(EFIVAR_OBJECTS) | libefivar.so @@ -134,7 +132,6 @@ deps : $(ALL_SOURCES) clean : @rm -rfv *~ *.o *.a *.E *.so *.so.* *.pc *.bin .*.d *.map \ makeguids guid-symbols.c include/efivar/efivar-guids.h \ - guids.lds \ $(TARGETS) $(STATICTARGETS) @# remove the deps files we used to create, as well. @rm -rfv .*.P .*.h.P *.S.P include/efivar/.*.h.P diff --git a/src/include/rules.mk b/src/include/rules.mk index f309f86..8d0b68a 100644 --- a/src/include/rules.mk +++ b/src/include/rules.mk @@ -3,7 +3,6 @@ default : all .PHONY: default all clean install test include $(TOPDIR)/src/include/version.mk -include $(TOPDIR)/src/include/workarounds.mk comma:= , empty:= @@ -36,9 +35,7 @@ family = $(foreach FAMILY_SUFFIX,$(FAMILY_SUFFIXES),$($(1)_$(FAMILY_SUFFIX))) $(CCLD) $(CCLDFLAGS) $(CPPFLAGS) -o $@ $(sort $^) $(LDLIBS) %.so : - $(CCLD) $(CCLDFLAGS) $(CPPFLAGS) $(SOFLAGS) \ - $(foreach LDS,$(LDSCRIPTS),$(LD_DASH_T) $(LDS)) \ - -o $@ $^ $(LDLIBS) + $(CCLD) $(CCLDFLAGS) $(CPPFLAGS) $(SOFLAGS) -o $@ $^ $(LDLIBS) ln -vfs $@ [email protected] %.abixml : %.so diff --git a/src/include/workarounds.mk b/src/include/workarounds.mk deleted file mode 100644 index 3118834..0000000 --- a/src/include/workarounds.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: SPDX-License-Identifier: LGPL-2.1-or-later -# -# workarounds.mk - workarounds for weird stuff behavior - -LD_FLAVOR := $(shell $(LD) --version | grep -E '^(LLD|GNU ld)'|sed 's/ .*//g') -LD_VERSION := $(shell $(LD) --version | grep -E '^(LLD|GNU ld)'|sed 's/.* //') -# I haven't tested 2.36 here; 2.35 is definitely broken and 2.37 seems to work -LD_DASH_T := $(shell \ - if [ "x${LD_FLAVOR}" = xLLD ] ; then \ - echo '-T' ; \ - elif [ "x${LD_FLAVOR}" = xGNU ] ; then \ - if echo "${LD_VERSION}" | grep -q -E '^2\.3[789]|^2\.[456789]|^[3456789]|^[[:digit:]][[:digit:]]' ; then \ - echo '-T' ; \ - else \ - echo "" ; \ - fi ; \ - else \ - echo "Your linker is not supported" ; \ - exit 1 ; \ - fi) - -export LD_DASH_T - -# vim:ft=make diff --git a/src/makeguids.c b/src/makeguids.c index e4ff411..b9e9312 100644 --- a/src/makeguids.c +++ b/src/makeguids.c @@ -107,51 +107,46 @@ write_guidnames(FILE *out, const char *listname, gn->symbol, gn->name, gn->description); } fprintf(out, "};\n"); + fprintf(out, "const struct efivar_guidname\n" + "\t__attribute__((__visibility__ (\"default\")))\n" + "\t* const %s = %s_;\n", listname, listname); + fprintf(out, "const struct efivar_guidname\n" + "\t__attribute__((__visibility__ (\"default\")))\n" + "\t* const %s_end = %s_\n\t+ %zd;\n", + listname, listname, n - 1); } int main(int argc, char *argv[]) { int rc; - int argstart = 0; - FILE *symout, *header, *ldsout; - int dash_t = 0; + FILE *symout, *header; - if (argc < 5) { + if (argc < 4) { errx(1, "Not enough arguments.\n"); - } else if (argc > 5 && !strcmp(argv[1],"-T")) { - argstart = 1; - dash_t = 1; - } else if (argc > 5) { + } else if (argc > 4) { errx(1, "Too many arguments.\n"); } - symout = fopen(argv[argstart + 2], "w"); + symout = fopen(argv[2], "w"); if (symout == NULL) - err(1, "could not open \"%s\"", argv[argstart + 2]); - rc = chmod(argv[argstart + 2], 0644); + err(1, "could not open \"%s\"", argv[2]); + rc = chmod(argv[2], 0644); if (rc < 0) - warn("chmod(%s, 0644)", argv[argstart + 2]); + warn("chmod(%s, 0644)", argv[2]); - header = fopen(argv[argstart + 3], "w"); + header = fopen(argv[3], "w"); if (header == NULL) - err(1, "could not open \"%s\"", argv[argstart + 3]); - rc = chmod(argv[argstart + 3], 0644); - if (rc < 0) - warn("chmod(%s, 0644)", argv[argstart + 3]); - - ldsout = fopen(argv[argstart + 4], "w"); - if (ldsout == NULL) - err(1, "could not open \"%s\"", argv[argstart + 4]); - rc = chmod(argv[argstart + 4], 0644); + err(1, "could not open \"%s\"", argv[3]); + rc = chmod(argv[3], 0644); if (rc < 0) - warn("chmod(%s, 0644)", argv[argstart + 4]); + warn("chmod(%s, 0644)", argv[3]); struct guidname_index *guidnames = NULL; - rc = read_guids_at(AT_FDCWD, argv[argstart + 1], &guidnames); + rc = read_guids_at(AT_FDCWD, argv[1], &guidnames); if (rc < 0) - err(1, "could not read \"%s\"", argv[argstart + 1]); + err(1, "could not read \"%s\"", argv[1]); struct efivar_guidname *outbuf; @@ -239,12 +234,11 @@ struct efivar_guidname {\n\ fprintf(header, "extern const struct efivar_guidname\n" "\t__attribute__((__visibility__ (\"default\")))\n" - "\tefi_well_known_guids[%d];\n", - i); + "\t* const efi_well_known_guids;\n"); fprintf(header, "extern const struct efivar_guidname\n" "\t__attribute__((__visibility__ (\"default\")))\n" - "\tefi_well_known_guids_end;\n"); + "\t* const efi_well_known_guids_end;\n"); fprintf(header, "extern const uint64_t\n" "\t__attribute__((__visibility__ (\"default\")))\n" @@ -252,12 +246,11 @@ struct efivar_guidname {\n\ fprintf(header, "extern const struct efivar_guidname\n" "\t__attribute__((__visibility__ (\"default\")))\n" - "\tefi_well_known_names[%d];\n", - i); + "\t* const efi_well_known_names;\n"); fprintf(header, "extern const struct efivar_guidname\n" "\t__attribute__((__visibility__ (\"default\")))\n" - "\tefi_well_known_names_end;\n"); + "\t* const efi_well_known_names_end;\n"); fprintf(header, "extern const uint64_t\n" "\t__attribute__((__visibility__ (\"default\")))\n" @@ -302,23 +295,6 @@ struct efivar_guidname {\n\ fclose(symout); - fprintf(ldsout, - "SECTIONS\n" - "{\n" - " .data :\n" - " {\n" - " efi_well_known_guids = efi_well_known_guids_;\n" - " efi_well_known_guids_end = efi_well_known_guids_ + %zd;\n" - " efi_well_known_names = efi_well_known_names_;\n" - " efi_well_known_names_end = efi_well_known_names_ + %zd;\n" - " }\n" - "}%s;\n", - (line - 1) * sizeof(struct efivar_guidname), - (line - 1) * sizeof(struct efivar_guidname), - dash_t ? " INSERT AFTER .data" : ""); - - fclose(ldsout); - free(guidnames->strtab); free(guidnames); -- 2.35.3 ++++++ efivar-filter-gcc-march.patch ++++++ >From 85419ca09d225630cd1740e554bfb65c560e3904 Mon Sep 17 00:00:00 2001 From: Gary Lin <[email protected]> Date: Wed, 21 Dec 2022 14:49:34 +0800 Subject: [PATCH] Exclude '-march=native' from ppc64le and riscv64 Since gcc of ppc64le and riscv64 doesn't support '-march=native', remove it from HOST_CPPFLAGS. Signed-off-by: Gary Lin <[email protected]> --- src/include/defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/defaults.mk b/src/include/defaults.mk index 9da5182..94502ed 100644 --- a/src/include/defaults.mk +++ b/src/include/defaults.mk @@ -70,7 +70,7 @@ override SOFLAGS = $(_SOFLAGS) \ $(call family,SOFLAGS) HOST_ARCH=$(shell uname -m) -ifneq ($(HOST_ARCH),ia64) +ifeq (, $(filter ia64 riscv64 ppc64le, $(HOST_ARCH))) HOST_MARCH=-march=native else HOST_MARCH= -- 2.35.3 ++++++ libefiboot-export-disk_get_partition_info.patch ++++++ --- /var/tmp/diff_new_pack.RBT3bm/_old 2023-03-16 22:57:15.875144812 +0100 +++ /var/tmp/diff_new_pack.RBT3bm/_new 2023-03-16 22:57:15.879144832 +0100 @@ -1,8 +1,8 @@ -Index: efivar-37/src/disk.c +Index: efivar-38/src/disk.c =================================================================== ---- efivar-37.orig/src/disk.c -+++ efivar-37/src/disk.c -@@ -256,6 +256,33 @@ is_partitioned(int fd) +--- efivar-38.orig/src/disk.c ++++ efivar-38/src/disk.c +@@ -239,6 +239,34 @@ is_partitioned(int fd) return true; } @@ -30,16 +30,17 @@ + uint8_t *mbr_type, uint8_t *signature_type) +{ + return get_partition_info(fd, EFIBOOT_OPTIONS_IGNORE_PMBR_ERR, part, -+ start, size, signature, mbr_type, signature_type); ++ start, size, (partition_signature_t *)signature, mbr_type, ++ signature_type); +} + ssize_t HIDDEN make_hd_dn(uint8_t *buf, ssize_t size, int fd, int32_t partition, - uint32_t options) -Index: efivar-37/src/include/efivar/efiboot-disk.h + uint32_t options) +Index: efivar-38/src/include/efivar/efiboot-disk.h =================================================================== --- /dev/null -+++ efivar-37/src/include/efivar/efiboot-disk.h ++++ efivar-38/src/include/efivar/efiboot-disk.h @@ -0,0 +1,32 @@ +/* + * libefiboot - library for the manipulation of EFI boot variables @@ -73,27 +74,26 @@ + __attribute__((__visibility__ ("default"))); + +#endif /* _EFIBOOT_BOOT_H */ -Index: efivar-37/src/include/efivar/efiboot.h +Index: efivar-38/src/include/efivar/efiboot.h =================================================================== ---- efivar-37.orig/src/include/efivar/efiboot.h -+++ efivar-37/src/include/efivar/efiboot.h -@@ -34,5 +34,6 @@ +--- efivar-38.orig/src/include/efivar/efiboot.h ++++ efivar-38/src/include/efivar/efiboot.h +@@ -20,6 +20,7 @@ #include <efivar/efiboot-creator.h> #include <efivar/efiboot-loadopt.h> +#include <efivar/efiboot-disk.h> - #endif /* EFIBOOT_H */ -Index: efivar-37/src/libefiboot.map.in + extern uint32_t efi_get_libefiboot_version(void) + __attribute__((__visibility__("default"))); +Index: efivar-38/src/libefiboot.map.in =================================================================== ---- efivar-37.orig/src/libefiboot.map.in -+++ efivar-37/src/libefiboot.map.in -@@ -33,3 +33,7 @@ LIBEFIBOOT_1.29 { +--- efivar-38.orig/src/libefiboot.map.in ++++ efivar-38/src/libefiboot.map.in +@@ -36,4 +36,5 @@ LIBEFIBOOT_1.30 { - LIBEFIBOOT_1.30 { - } LIBEFIBOOT_1.29; -+ -+LIBEFIBOOT_1.31 { -+ global: efi_disk_get_partition_info; -+} LIBEFIBOOT_1.30; + LIBEFIBOOT_1.31 { + global: efi_get_libefiboot_version; ++ efi_disk_get_partition_info; + } LIBEFIBOOT_1.30;
