From d12cfc7f995e0eb82338555655d9f76dfcb00c5d Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Thu, 7 Dec 2023 11:34:36 +0300 Subject: [PATCH] Fix build --- SOURCES/0001-MSVSphere-fix-build.patch | 25 +++++++++++++++++++++++++ SPECS/efibootmgr.spec | 7 +++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 SOURCES/0001-MSVSphere-fix-build.patch diff --git a/SOURCES/0001-MSVSphere-fix-build.patch b/SOURCES/0001-MSVSphere-fix-build.patch new file mode 100644 index 0000000..469b1e2 --- /dev/null +++ b/SOURCES/0001-MSVSphere-fix-build.patch @@ -0,0 +1,25 @@ +From c5a465457d9a44d2745f6842359b875958dad55c Mon Sep 17 00:00:00 2001 +From: Sergey Cherevko +Date: Thu, 7 Dec 2023 11:19:05 +0300 +Subject: [PATCH] MSVSphere fix build + +--- + Make.defaults | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.defaults b/Make.defaults +index f4f3a9b..49ab709 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -32,7 +32,7 @@ SUBDIR_CFLAGS ?= + clang_cflags = + gcc_cflags = + cflags = $(CFLAGS) $(SUBDIR_CFLAGS) \ +- -Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \ ++ -Wno-error=pointer-sign -Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \ + -std=gnu11 -fPIC \ + -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \ + -DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \ +-- +2.39.3 + diff --git a/SPECS/efibootmgr.spec b/SPECS/efibootmgr.spec index 1d7bbbe..46602c1 100644 --- a/SPECS/efibootmgr.spec +++ b/SPECS/efibootmgr.spec @@ -3,7 +3,7 @@ Summary: EFI Boot Manager Name: efibootmgr Version: 16 -Release: 1%{?dist} +Release: 1%{?dist}.inferit Group: System Environment/Base License: GPLv2+ URL: http://github.com/rhinstaller/%{name}/ @@ -18,6 +18,8 @@ Conflicts: elilo <= 3.6-6 Obsoletes: elilo <= 3.6-6 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +# MSVSphere +Patch100: 0001-MSVSphere-fix-build.patch %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')) @@ -58,7 +60,8 @@ rm -rf %{buildroot} %doc README %changelog -* Tue Jul 25 2023 MSVSphere Packaging Team - 16-1 +* Thu Dec 07 2023 Sergey Cherevko - 16-1.inferit +- Fix build - Rebuilt for MSVSphere 8.8 * Mon Apr 09 2018 Peter Jones - 16-1