160 lines
5.0 KiB
Diff
160 lines
5.0 KiB
Diff
From e94b4f23277f7572aacbbeae50b8927e03be148a Mon Sep 17 00:00:00 2001
|
||
From: Petr Vorel <pvorel@suse.cz>
|
||
Date: Thu, 15 Jul 2021 17:35:27 +0200
|
||
Subject: osdep: Introduce include/grub/osdep/major.h and use it
|
||
|
||
... to factor out fix for glibc 2.25 introduced in 7a5b301e3 (build: Use
|
||
AC_HEADER_MAJOR to find device macros).
|
||
|
||
Note: Once glibc 2.25 is old enough and this fix is not needed also
|
||
AC_HEADER_MAJOR in configure.ac should be removed.
|
||
|
||
Reference：https://git.savannah.gnu.org/cgit/grub.git/commit/?id=e94b4f23277f7572aacbbeae50b8927e03be148a
|
||
Conflict：NA
|
||
|
||
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
---
|
||
configure.ac | 2 +-
|
||
grub-core/osdep/devmapper/getroot.c | 7 +------
|
||
grub-core/osdep/devmapper/hostdisk.c | 7 +------
|
||
grub-core/osdep/linux/getroot.c | 7 +------
|
||
grub-core/osdep/unix/getroot.c | 7 +------
|
||
include/grub/osdep/major.h | 33 +++++++++++++++++++++++++++++++++
|
||
6 files changed, 38 insertions(+), 25 deletions(-)
|
||
create mode 100644 include/grub/osdep/major.h
|
||
|
||
diff --git a/configure.ac b/configure.ac
|
||
index b025e1e..bee28db 100644
|
||
--- a/configure.ac
|
||
+++ b/configure.ac
|
||
@@ -424,7 +424,7 @@ AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
|
||
|
||
# glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation
|
||
# warning which causes compilation failure later with -Werror. So use -Werror here
|
||
-# as well to force proper sys/sysmacros.h detection.
|
||
+# as well to force proper sys/sysmacros.h detection. Used in include/grub/osdep/major.h.
|
||
SAVED_CFLAGS="$CFLAGS"
|
||
CFLAGS="$HOST_CFLAGS -Werror"
|
||
AC_HEADER_MAJOR
|
||
diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c
|
||
index a13a39c..9ba5c98 100644
|
||
--- a/grub-core/osdep/devmapper/getroot.c
|
||
+++ b/grub-core/osdep/devmapper/getroot.c
|
||
@@ -40,12 +40,7 @@
|
||
#include <limits.h>
|
||
#endif
|
||
|
||
-#if defined(MAJOR_IN_MKDEV)
|
||
-#include <sys/mkdev.h>
|
||
-#elif defined(MAJOR_IN_SYSMACROS)
|
||
-#include <sys/sysmacros.h>
|
||
-#endif
|
||
-
|
||
+#include <grub/osdep/major.h>
|
||
#include <libdevmapper.h>
|
||
|
||
#include <grub/types.h>
|
||
diff --git a/grub-core/osdep/devmapper/hostdisk.c b/grub-core/osdep/devmapper/hostdisk.c
|
||
index a8afc0c..c805372 100644
|
||
--- a/grub-core/osdep/devmapper/hostdisk.c
|
||
+++ b/grub-core/osdep/devmapper/hostdisk.c
|
||
@@ -11,6 +11,7 @@
|
||
#include <grub/misc.h>
|
||
#include <grub/i18n.h>
|
||
#include <grub/list.h>
|
||
+#include <grub/osdep/major.h>
|
||
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
@@ -24,12 +25,6 @@
|
||
#include <errno.h>
|
||
#include <limits.h>
|
||
|
||
-#if defined(MAJOR_IN_MKDEV)
|
||
-#include <sys/mkdev.h>
|
||
-#elif defined(MAJOR_IN_SYSMACROS)
|
||
-#include <sys/sysmacros.h>
|
||
-#endif
|
||
-
|
||
#ifdef HAVE_DEVICE_MAPPER
|
||
# include <libdevmapper.h>
|
||
|
||
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
|
||
index 001b818..cd58858 100644
|
||
--- a/grub-core/osdep/linux/getroot.c
|
||
+++ b/grub-core/osdep/linux/getroot.c
|
||
@@ -35,12 +35,7 @@
|
||
#include <limits.h>
|
||
#endif
|
||
|
||
-#if defined(MAJOR_IN_MKDEV)
|
||
-#include <sys/mkdev.h>
|
||
-#elif defined(MAJOR_IN_SYSMACROS)
|
||
-#include <sys/sysmacros.h>
|
||
-#endif
|
||
-
|
||
+#include <grub/osdep/major.h>
|
||
#include <grub/types.h>
|
||
#include <sys/ioctl.h> /* ioctl */
|
||
#include <sys/mount.h>
|
||
diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
|
||
index 46d7116..74f6911 100644
|
||
--- a/grub-core/osdep/unix/getroot.c
|
||
+++ b/grub-core/osdep/unix/getroot.c
|
||
@@ -51,12 +51,7 @@
|
||
#endif /* ! FLOPPY_MAJOR */
|
||
#endif
|
||
|
||
-#include <sys/types.h>
|
||
-#if defined(MAJOR_IN_MKDEV)
|
||
-#include <sys/mkdev.h>
|
||
-#elif defined(MAJOR_IN_SYSMACROS)
|
||
-#include <sys/sysmacros.h>
|
||
-#endif
|
||
+#include <grub/osdep/major.h>
|
||
|
||
#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
|
||
# include <grub/util/libzfs.h>
|
||
diff --git a/include/grub/osdep/major.h b/include/grub/osdep/major.h
|
||
new file mode 100644
|
||
index 0000000..84a9159
|
||
--- /dev/null
|
||
+++ b/include/grub/osdep/major.h
|
||
@@ -0,0 +1,33 @@
|
||
+/*
|
||
+ * GRUB -- GRand Unified Bootloader
|
||
+ * Copyright (C) 2021 Free Software Foundation, Inc.
|
||
+ *
|
||
+ * GRUB is free software: you can redistribute it and/or modify
|
||
+ * it under the terms of the GNU General Public License as published by
|
||
+ * the Free Software Foundation, either version 3 of the License, or
|
||
+ * (at your option) any later version.
|
||
+ *
|
||
+ * GRUB is distributed in the hope that it will be useful,
|
||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
+ * GNU General Public License for more details.
|
||
+ *
|
||
+ * You should have received a copy of the GNU General Public License
|
||
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||
+ *
|
||
+ * Fix for glibc 2.25 which is deprecating the namespace pollution of
|
||
+ * sys/types.h injecting major(), minor(), and makedev() into the
|
||
+ * compilation environment.
|
||
+ */
|
||
+
|
||
+#ifndef GRUB_OSDEP_MAJOR_H
|
||
+#define GRUB_OSDEP_MAJOR_H 1
|
||
+
|
||
+#include <sys/types.h>
|
||
+
|
||
+#ifdef MAJOR_IN_MKDEV
|
||
+# include <sys/mkdev.h>
|
||
+#elif defined (MAJOR_IN_SYSMACROS)
|
||
+# include <sys/sysmacros.h>
|
||
+#endif
|
||
+#endif /* GRUB_OSDEP_MAJOR_H */
|
||
--
|
||
cgit v1.1
|