mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
db7cf3a089
Add some fixes for BLS parsing logic and also make 20-grub.install script to query the relative path of the kernel and initramfs images, so BLS can also work when /boot is not a mount point or is a btrfs subvolume. Also pull some build fixes. Resolves: rhbz#1588184 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From 9808c3ef956c6472a96790b60cf74f4eaa742010 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Mon, 8 May 2017 19:37:29 +0200
|
|
Subject: [PATCH 018/243] Rename uboot/datetime to dummy/datetime.
|
|
|
|
It's just a stub and is not UBoot-specific.
|
|
---
|
|
grub-core/Makefile.core.def | 2 +-
|
|
grub-core/lib/{uboot => dummy}/datetime.c | 5 ++---
|
|
2 files changed, 3 insertions(+), 4 deletions(-)
|
|
rename grub-core/lib/{uboot => dummy}/datetime.c (91%)
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index 2a38bd4bc8a..6540dc951d4 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -1552,7 +1552,7 @@ module = {
|
|
name = datetime;
|
|
cmos = lib/cmos_datetime.c;
|
|
efi = lib/efi/datetime.c;
|
|
- uboot = lib/uboot/datetime.c;
|
|
+ uboot = lib/dummy/datetime.c;
|
|
sparc64_ieee1275 = lib/ieee1275/datetime.c;
|
|
powerpc_ieee1275 = lib/ieee1275/datetime.c;
|
|
sparc64_ieee1275 = lib/ieee1275/cmos.c;
|
|
diff --git a/grub-core/lib/uboot/datetime.c b/grub-core/lib/dummy/datetime.c
|
|
similarity index 91%
|
|
rename from grub-core/lib/uboot/datetime.c
|
|
rename to grub-core/lib/dummy/datetime.c
|
|
index 4be716928a5..cf693fc6b62 100644
|
|
--- a/grub-core/lib/uboot/datetime.c
|
|
+++ b/grub-core/lib/dummy/datetime.c
|
|
@@ -18,7 +18,6 @@
|
|
|
|
#include <grub/types.h>
|
|
#include <grub/symbol.h>
|
|
-#include <grub/uboot/uboot.h>
|
|
#include <grub/datetime.h>
|
|
#include <grub/dl.h>
|
|
|
|
@@ -30,12 +29,12 @@ grub_err_t
|
|
grub_get_datetime (struct grub_datetime *datetime __attribute__ ((unused)))
|
|
{
|
|
return grub_error (GRUB_ERR_INVALID_COMMAND,
|
|
- "can\'t get datetime using U-Boot");
|
|
+ "can\'t get datetime on this machine");
|
|
}
|
|
|
|
grub_err_t
|
|
grub_set_datetime (struct grub_datetime * datetime __attribute__ ((unused)))
|
|
{
|
|
return grub_error (GRUB_ERR_INVALID_COMMAND,
|
|
- "can\'t set datetime using U-Boot");
|
|
+ "can\'t set datetime on this machine");
|
|
}
|
|
--
|
|
2.17.1
|
|
|