Thanks, applied as 8280df0f8912f723c8b349d567e2ed368316dc2d. Michael
[sent from post-receive hook] On Thu, 08 Feb 2024 17:03:37 +0100, Christian Melki <[email protected]> wrote: > Bunch of fixes mostly. > https://github.com/rhboot/efivar/releases/tag/39 > > * Change URL. Ongoing saga with github automatic tarballing vs archive > releases. But it looks like this release have yet to be packaged as an > archive release. > > * Remove all patches. Afaict, they have all been fixed in this release. > > * Disable doc building. Was part of the patches, now has a flag. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch > > b/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch > deleted file mode 100644 > index 12db66bfa0ae..000000000000 > --- > a/patches/efivar-38/0001-src-Makefile-build-util.c-separately-for-makeguids.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From: Alexander Kanavin <[email protected]> > -Date: Tue, 18 Jan 2022 11:53:41 +0100 > -Subject: [PATCH] src/Makefile: build util.c separately for makeguids > - > -util.c needs to be built twice when cross-compiling: > -for the build machine to be able to link with > -makeguids which then runs during the same build, > -and then for the actual target. > - > -Upstream-Status: Submitted [https://github.com/rhboot/efivar/pull/203] > -Signed-off-by: Alexander Kanavin <[email protected]> > ---- > - src/Makefile | 5 ++++- > - 1 file changed, 4 insertions(+), 1 deletion(-) > - > -diff --git a/src/Makefile b/src/Makefile > -index 0e423c44601a..b10051ba0adf 100644 > ---- a/src/Makefile > -+++ b/src/Makefile > -@@ -28,10 +28,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(patsubst > %.c,%.o,$(EFIVAR_SOURCES))) > - EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c > - 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_SOURCES = makeguids.c util-makeguids.c > - MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst > %.c,%.o,$(MAKEGUIDS_SOURCES))) > - MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) guids.lds > - > -+util-makeguids.c : > -+ cp util.c util-makeguids.c > -+ > - ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) > \ > - $(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \ > - $(sort $(wildcard include/efivar/*.h)) > diff --git a/patches/efivar-38/0002-docs-Remove-docs-building.patch > b/patches/efivar-38/0002-docs-Remove-docs-building.patch > deleted file mode 100644 > index ef34cf96c630..000000000000 > --- a/patches/efivar-38/0002-docs-Remove-docs-building.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From: Christian Melki <[email protected]> > -Date: Fri, 28 Jan 2022 18:42:13 +0100 > -Subject: [PATCH] docs: Remove docs building. > - > -efivar uses mandoc which ptxdist does not provide (yet). > -Just skip the entire documentation generation and installation. > - > -Signed-off-by: Christian Melki <[email protected]> > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index c896fc38c210..bf081a66970d 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -7,7 +7,7 @@ include $(TOPDIR)/src/include/defaults.mk > - include $(TOPDIR)/src/include/coverity.mk > - include $(TOPDIR)/src/include/scan-build.mk > - > --SUBDIRS := src docs > -+SUBDIRS := src > - > - all : | efivar.spec src/include/version.mk prep > - all clean install prep : > diff --git a/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch > b/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch > deleted file mode 100644 > index fef499699cd6..000000000000 > --- a/patches/efivar-38/0003-fix-building-with-binutils-2.36.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Mon, 7 Mar 2022 08:35:41 +0100 > -Subject: [PATCH] fix building with binutils 2.36 > - > -'-T' must be used here as well. Otherwise building fails with: > - > -.../bin/ld: warning: guids.lds contains output sections; did you forget -T? > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - src/include/workarounds.mk | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/include/workarounds.mk b/src/include/workarounds.mk > -index 311883427118..a0521686b2bc 100644 > ---- a/src/include/workarounds.mk > -+++ b/src/include/workarounds.mk > -@@ -9,7 +9,7 @@ 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 \ > -+ if echo "${LD_VERSION}" | grep -q -E > '^2\.3[6789]|^2\.[456789]|^[3456789]|^[[:digit:]][[:digit:]]' ; then \ > - echo '-T' ; \ > - else \ > - echo "" ; \ > diff --git > a/patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch > b/patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch > deleted file mode 100644 > index 883e0c780d37..000000000000 > --- a/patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch > +++ /dev/null > @@ -1,54 +0,0 @@ > -From: Robbie Harwood <[email protected]> > -Date: Thu, 28 Jul 2022 16:11:24 -0400 > -Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts) > - > -glibc has decided that sys/mount.h and linux/mount.h are no longer > -usable at the same time. This broke the build, since linux/fs.h itself > -includes linux/mount.h. For now, fix the build by only including > -sys/mount.h where we need it. > - > -See-also: > https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E > -Resolves: #227 > -Signed-off-by: Robbie Harwood <[email protected]> > ---- > - src/gpt.c | 1 + > - src/linux.c | 1 + > - src/util.h | 1 - > - 3 files changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/src/gpt.c b/src/gpt.c > -index 1eda04970314..21413c3b1ad0 100644 > ---- a/src/gpt.c > -+++ b/src/gpt.c > -@@ -17,6 +17,7 @@ > - #include <stdio.h> > - #include <stdlib.h> > - #include <string.h> > -+#include <sys/mount.h> > - #include <sys/param.h> > - #include <sys/stat.h> > - #include <sys/utsname.h> > -diff --git a/src/linux.c b/src/linux.c > -index 47e45ae46e73..1780816f6343 100644 > ---- a/src/linux.c > -+++ b/src/linux.c > -@@ -20,6 +20,7 @@ > - #include <stdbool.h> > - #include <stdio.h> > - #include <sys/ioctl.h> > -+#include <sys/mount.h> > - #include <sys/socket.h> > - #include <sys/sysmacros.h> > - #include <sys/types.h> > -diff --git a/src/util.h b/src/util.h > -index 3300666f4270..1e67e4476f01 100644 > ---- a/src/util.h > -+++ b/src/util.h > -@@ -23,7 +23,6 @@ > - #include <stdio.h> > - #include <string.h> > - #include <sys/ioctl.h> > --#include <sys/mount.h> > - #include <sys/stat.h> > - #include <sys/types.h> > - #include <tgmath.h> > diff --git a/patches/efivar-38/series b/patches/efivar-38/series > deleted file mode 100644 > index 2358818434f3..000000000000 > --- a/patches/efivar-38/series > +++ /dev/null > @@ -1,7 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-src-Makefile-build-util.c-separately-for-makeguids.patch > -0002-docs-Remove-docs-building.patch > -0003-fix-building-with-binutils-2.36.patch > -0004-Fix-glibc-2.36-build-mount.h-conflicts.patch > -# a80afc43ec18684521a15f0f59588a87 - git-ptx-patches magic > diff --git a/rules/efivar.make b/rules/efivar.make > index 304885f65c05..5cbd86d68c39 100644 > --- a/rules/efivar.make > +++ b/rules/efivar.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_EFIVAR) += efivar > # > # Paths and names > # > -EFIVAR_VERSION := 38 > -EFIVAR_MD5 := 243fdbc48440212695cb9c6e6fd0f44f > +EFIVAR_VERSION := 39 > +EFIVAR_MD5 := a8fc3e79336cd6e738ab44f9bc96a5aa > EFIVAR := efivar-$(EFIVAR_VERSION) > -EFIVAR_SUFFIX := tar.bz2 > -EFIVAR_URL := > https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX) > +EFIVAR_SUFFIX := tar.gz > +EFIVAR_URL := > https://github.com/rhboot/efivar/archive/refs/tags/$(EFIVAR_VERSION).$(EFIVAR_SUFFIX) > EFIVAR_SOURCE := $(SRCDIR)/$(EFIVAR).$(EFIVAR_SUFFIX) > EFIVAR_DIR := $(BUILDDIR)/$(EFIVAR) > EFIVAR_LICENSE := LGPL-2.1-only > @@ -32,6 +32,7 @@ EFIVAR_MAKE_ENV := \ > $(CROSS_ENV) \ > LIBDIR=/usr/lib \ > ERRORS="-Wno-error" \ > + ENABLE_DOCS=0 \ > PTXDIST_ICECC=$(PTXDIST_ICERUN) > > EFIVAR_CFLAGS := \
