Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package efivar for openSUSE:Factory checked
in at 2022-08-11 18:31:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/efivar (Old)
and /work/SRC/openSUSE:Factory/.efivar.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efivar"
Thu Aug 11 18:31:18 2022 rev:21 rq:994225 version:37
Changes:
--------
--- /work/SRC/openSUSE:Factory/efivar/efivar.changes 2021-06-21
20:34:45.910568601 +0200
+++ /work/SRC/openSUSE:Factory/.efivar.new.1521/efivar.changes 2022-08-11
18:31:22.714129712 +0200
@@ -1,0 +2,6 @@
+Wed Aug 10 01:54:21 UTC 2022 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Add efivar-bsc1202209-fix-glibc-2.36-build.patch to fix the build
+ error against glibc 2.36 (bsc#1202209)
+
+-------------------------------------------------------------------
New:
----
efivar-bsc1202209-fix-glibc-2.36-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ efivar.spec ++++++
--- /var/tmp/diff_new_pack.1uk4UD/_old 2022-08-11 18:31:23.178130798 +0200
+++ /var/tmp/diff_new_pack.1uk4UD/_new 2022-08-11 18:31:23.186130817 +0200
@@ -1,7 +1,7 @@
#
# spec file for package efivar
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,7 @@
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
@@ -94,6 +95,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
CFLAGS="%{optflags} -Wno-nonnull -flto"
++++++ efivar-bsc1202209-fix-glibc-2.36-build.patch ++++++
>From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharw...@redhat.com>
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 <rharw...@redhat.com>
---
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 1eda049..21413c3 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 47e45ae..1780816 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 3300666..1e67e44 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>
--
2.35.3
