5e72956199
This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
94 lines
3.2 KiB
Diff
94 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
Date: Wed, 15 Dec 2021 15:46:13 -0500
|
|
Subject: [PATCH] Use visual indentation in config.h.in
|
|
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
(cherry picked from commit de8051f34de0aa55c921a510974e5bb27e39c17b)
|
|
[rharwood: GRUB_RPM_CONFIG presence]
|
|
---
|
|
config.h.in | 58 +++++++++++++++++++++++++++++-----------------------------
|
|
1 file changed, 29 insertions(+), 29 deletions(-)
|
|
|
|
diff --git a/config.h.in b/config.h.in
|
|
index c80e3e0aba3..f2ed0066ec0 100644
|
|
--- a/config.h.in
|
|
+++ b/config.h.in
|
|
@@ -23,47 +23,47 @@
|
|
#define MINILZO_CFG_SKIP_LZO1X_DECOMPRESS 1
|
|
|
|
#if defined (GRUB_BUILD)
|
|
-#undef ENABLE_NLS
|
|
-#define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
|
|
-#define BUILD_SIZEOF_VOID_P @BUILD_SIZEOF_VOID_P@
|
|
-#if defined __APPLE__
|
|
-# if defined __BIG_ENDIAN__
|
|
-# define BUILD_WORDS_BIGENDIAN 1
|
|
-# else
|
|
-# define BUILD_WORDS_BIGENDIAN 0
|
|
-# endif
|
|
-#else
|
|
-#define BUILD_WORDS_BIGENDIAN @BUILD_WORDS_BIGENDIAN@
|
|
-#endif
|
|
+# undef ENABLE_NLS
|
|
+# define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
|
|
+# define BUILD_SIZEOF_VOID_P @BUILD_SIZEOF_VOID_P@
|
|
+# if defined __APPLE__
|
|
+# if defined __BIG_ENDIAN__
|
|
+# define BUILD_WORDS_BIGENDIAN 1
|
|
+# else
|
|
+# define BUILD_WORDS_BIGENDIAN 0
|
|
+# endif
|
|
+# else /* !defined __APPLE__ */
|
|
+# define BUILD_WORDS_BIGENDIAN @BUILD_WORDS_BIGENDIAN@
|
|
+# endif /* !defined __APPLE__ */
|
|
#elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
|
|
-#include <config-util.h>
|
|
-#else
|
|
-#define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
|
|
+# include <config-util.h>
|
|
+#else /* !defined GRUB_UTIL && defined GRUB_MACHINE */
|
|
+# define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
|
|
/* Define if C symbols get an underscore after compilation. */
|
|
-#define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
|
|
+# define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
|
|
/* Define it to one of __bss_start, edata and _edata. */
|
|
-#define BSS_START_SYMBOL @BSS_START_SYMBOL@
|
|
+# define BSS_START_SYMBOL @BSS_START_SYMBOL@
|
|
/* Define it to either end or _end. */
|
|
-#define END_SYMBOL @END_SYMBOL@
|
|
+# define END_SYMBOL @END_SYMBOL@
|
|
/* Name of package. */
|
|
-#define PACKAGE "@PACKAGE@"
|
|
+# define PACKAGE "@PACKAGE@"
|
|
/* Version number of package. */
|
|
-#define VERSION "@VERSION@"
|
|
+# define VERSION "@VERSION@"
|
|
/* Define to the full name and version of this package. */
|
|
-#define PACKAGE_STRING "@PACKAGE_STRING@"
|
|
+# define PACKAGE_STRING "@PACKAGE_STRING@"
|
|
/* Define to the version of this package. */
|
|
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
|
|
+# define PACKAGE_VERSION "@PACKAGE_VERSION@"
|
|
/* Define to the full name of this package. */
|
|
-#define PACKAGE_NAME "@PACKAGE_NAME@"
|
|
+# define PACKAGE_NAME "@PACKAGE_NAME@"
|
|
/* Define to the address where bug reports for this package should be sent. */
|
|
-#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
|
|
+# define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
|
|
|
|
-#define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
|
|
-#define GRUB_PLATFORM "@GRUB_PLATFORM@"
|
|
-#define GRUB_RPM_VERSION "@GRUB_RPM_VERSION@"
|
|
+# define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
|
|
+# define GRUB_PLATFORM "@GRUB_PLATFORM@"
|
|
+# define GRUB_RPM_VERSION "@GRUB_RPM_VERSION@"
|
|
|
|
-#define RE_ENABLE_I18N 1
|
|
+# define RE_ENABLE_I18N 1
|
|
|
|
-#define _GNU_SOURCE 1
|
|
+# define _GNU_SOURCE 1
|
|
|
|
#endif
|