e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
30 lines
985 B
Diff
30 lines
985 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 26 Jun 2017 12:46:23 -0400
|
|
Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
|
|
|
|
---
|
|
include/grub/dl.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/include/grub/dl.h b/include/grub/dl.h
|
|
index f03c03561a1..90dc9bb1017 100644
|
|
--- a/include/grub/dl.h
|
|
+++ b/include/grub/dl.h
|
|
@@ -54,6 +54,7 @@ grub_mod_fini (void)
|
|
|
|
#define GRUB_MOD_INIT(name) \
|
|
static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
|
|
+extern void grub_##name##_init (void); \
|
|
void \
|
|
grub_##name##_init (void) { grub_mod_init (0); } \
|
|
static void \
|
|
@@ -61,6 +62,7 @@ grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
|
|
|
|
#define GRUB_MOD_FINI(name) \
|
|
static void grub_mod_fini (void) __attribute__ ((used)); \
|
|
+extern void grub_##name##_fini (void); \
|
|
void \
|
|
grub_##name##_fini (void) { grub_mod_fini (); } \
|
|
static void \
|