Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4b3d50b112dcfd40bde1e5d17c3f7f77ce454912)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4b3d50b112dcfd40bde1e5d17c3f7f77ce454912)
  • Date: Sat, 10 Sep 2022 06:38:06 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

disk/efivar/DETAILS | 4 +-
disk/efivar/HISTORY | 5 +++
disk/efivar/PRE_BUILD | 4 +-
disk/efivar/patches/glibc-2.36.patch | 55
+++++++++++++++++++++++++++++++++++
4 files changed, 64 insertions(+), 4 deletions(-)

New commits:
commit 4b3d50b112dcfd40bde1e5d17c3f7f77ce454912
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/efivar: version 38

diff --git a/disk/efivar/DETAILS b/disk/efivar/DETAILS
index 5deb56d..7c63476 100755
--- a/disk/efivar/DETAILS
+++ b/disk/efivar/DETAILS
@@ -1,6 +1,6 @@
SPELL=efivar
- VERSION=37
-
SOURCE_HASH=sha512:305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
+ VERSION=38
+
SOURCE_HASH=sha512:c2f17297c863ece134a9dd758d237fd2df8c8d072f87af1d0bf2bcf9acfc7a53c25597f03fd4fb8cc664b205743d4ffa0ef1b068d0f73c58fa573d40993f3155
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://github.com/rhboot/$SPELL
diff --git a/disk/efivar/HISTORY b/disk/efivar/HISTORY
index 528639d..827fc2b 100644
--- a/disk/efivar/HISTORY
+++ b/disk/efivar/HISTORY
@@ -1,3 +1,8 @@
+2022-09-10 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 38
+ * PRE_BUILD, patches/glibc-2.36.patch: adapted file location for sed
+ scripts/fixes, added upstream patch allowing to build with glibc
2.36
+
2021-09-22 Florian Franzmann <bwlf AT bandrate.org>
* BUILD: work around build errors

diff --git a/disk/efivar/PRE_BUILD b/disk/efivar/PRE_BUILD
index ff4d785..b73f094 100755
--- a/disk/efivar/PRE_BUILD
+++ b/disk/efivar/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-sed -i 's/lib64/lib/' Make.defaults &&
-sed -i 's/-Werror//' Make.defaults
+sed -e 's/lib64/lib/' -e 's/-Werror//' -i src/include/defaults.mk &&

+apply_patch_dir patches
diff --git a/disk/efivar/patches/glibc-2.36.patch
b/disk/efivar/patches/glibc-2.36.patch
new file mode 100644
index 0000000..fcc83ae
--- /dev/null
+++ b/disk/efivar/patches/glibc-2.36.patch
@@ -0,0 +1,55 @@
+From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood AT 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 <rharwood AT 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 1eda0497..21413c3b 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 47e45ae4..1780816f 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 3300666f..1e67e447 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>



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4b3d50b112dcfd40bde1e5d17c3f7f77ce454912), Pavel Vinogradov, 09/10/2022

Archive powered by MHonArc 2.6.24.

Top of Page