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>
151 lines
3.9 KiB
Diff
151 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 23 Sep 2014 09:58:49 -0400
|
|
Subject: [PATCH] Fix up some man pages rpmdiff noticed.
|
|
|
|
---
|
|
configure.ac | 2 ++
|
|
util/grub-macbless.8 | 26 +++++++++++++++++++
|
|
util/grub-mkimage.1 | 2 +-
|
|
util/grub-syslinux2cfg.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
4 files changed, 94 insertions(+), 1 deletion(-)
|
|
create mode 100644 util/grub-macbless.8
|
|
create mode 100644 util/grub-syslinux2cfg.1
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index fc3c2b44d60..eb851b8d722 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -84,6 +84,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
|
|
grub_TRANSFORM([grub-glue-efi.3])
|
|
grub_TRANSFORM([grub-install.1])
|
|
grub_TRANSFORM([grub-kbdcomp.3])
|
|
+grub_TRANSFORM([grub-macbless.8])
|
|
grub_TRANSFORM([grub-menulst2cfg.1])
|
|
grub_TRANSFORM([grub-mkconfig.1])
|
|
grub_TRANSFORM([grub-mkfont.3])
|
|
@@ -102,6 +103,7 @@ grub_TRANSFORM([grub-render-label.3])
|
|
grub_TRANSFORM([grub-script-check.3])
|
|
grub_TRANSFORM([grub-set-default.1])
|
|
grub_TRANSFORM([grub-sparc64-setup.3])
|
|
+grub_TRANSFORM([grub-syslinux2cfg.1])
|
|
|
|
# Optimization flag. Allow user to override.
|
|
if test "x$TARGET_CFLAGS" = x; then
|
|
diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
|
|
new file mode 100644
|
|
index 00000000000..ae842f3a606
|
|
--- /dev/null
|
|
+++ b/util/grub-macbless.8
|
|
@@ -0,0 +1,26 @@
|
|
+.TH GRUB-MACBLESS 1 "Wed Feb 26 2014"
|
|
+.SH NAME
|
|
+\fBgrub-macbless\fR \(em Mac-style bless utility for HFS or HFS+
|
|
+
|
|
+.SH SYNOPSIS
|
|
+\fBgrub-macbless\fR [-p | --ppc] [-v | --verbose] [-x | --x86] \fIFILE\fR
|
|
+
|
|
+.SH DESCRIPTION
|
|
+\fBgrub-mkimage\fR blesses a file on an HFS or HFS+ file system, so that it
|
|
+can be used to boot a Mac.
|
|
+
|
|
+.SH OPTIONS
|
|
+.TP
|
|
+--ppc
|
|
+Bless the file for use on PPC-based Macs.
|
|
+
|
|
+.TP
|
|
+--verbose
|
|
+Print verbose messages.
|
|
+
|
|
+.TP
|
|
+--x86
|
|
+Bless the file for use on x86-based Macs.
|
|
+
|
|
+.SH SEE ALSO
|
|
+.BR "info grub"
|
|
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
|
|
index 4dea4f54597..0eaaafe505b 100644
|
|
--- a/util/grub-mkimage.1
|
|
+++ b/util/grub-mkimage.1
|
|
@@ -17,7 +17,7 @@
|
|
[-v | --verbose] \fIMODULES\fR
|
|
|
|
.SH DESCRIPTION
|
|
-\fBgrub-mkimage\fI builds a bootable image of GRUB.
|
|
+\fBgrub-mkimage\fR builds a bootable image of GRUB.
|
|
|
|
.SH OPTIONS
|
|
.TP
|
|
diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
|
|
new file mode 100644
|
|
index 00000000000..85309482718
|
|
--- /dev/null
|
|
+++ b/util/grub-syslinux2cfg.1
|
|
@@ -0,0 +1,65 @@
|
|
+.TH GRUB-SYSLINUX2CFG 1 "Wed Feb 26 2014"
|
|
+.SH NAME
|
|
+\fBgrub-syslinux2cfg\fR \(em Transform a syslinux config file into a GRUB config.
|
|
+
|
|
+.SH SYNOPSIS
|
|
+\fBgrub-syslinux2cfg\fR [-c | --cwd=\fRDIR\fI] [-r | --root=\fIDIR\fR] [-v | --verbose]
|
|
+.RE
|
|
+.RS 25
|
|
+[-t | --target-root=\fIDIR\fR] [-T | --target-cwd=\fIDIR\fR]
|
|
+.RE
|
|
+.RS 25
|
|
+[-o | --output=\fIFILE\fR] [[-i | --isolinux] |
|
|
+.RE
|
|
+.RS 46
|
|
+ [-s | --syslinux] |
|
|
+.RE
|
|
+.RS 46
|
|
+ [-p | --pxelinux]] \fIFILE\fR
|
|
+
|
|
+.SH DESCRIPTION
|
|
+\fBgrub-syslinux2cfg\fR builds a GRUB configuration file out of an existing
|
|
+syslinux configuration file.
|
|
+
|
|
+.SH OPTIONS
|
|
+.TP
|
|
+--cwd=\fIDIR\fR
|
|
+Set \fIDIR\fR as syslinux's working directory. The default is to use the
|
|
+parent directory of the input file.
|
|
+
|
|
+.TP
|
|
+--root=\fIDIR\fR
|
|
+Set \fIDIR\fR as the root directory of the syslinux disk. The default value
|
|
+is "/".
|
|
+
|
|
+.TP
|
|
+--verbose
|
|
+Print verbose messages.
|
|
+
|
|
+.TP
|
|
+--target-root=\fIDIR\fR
|
|
+Root directory as it will be seen at runtime. The default value is "/".
|
|
+
|
|
+.TP
|
|
+--target-cwd=\fIDIR\fR
|
|
+Working directory of syslinux as it will be seen at runtime. The default
|
|
+value is the parent directory of the input file.
|
|
+
|
|
+.TP
|
|
+--output=\fIFILE\fR
|
|
+Write the new config file to \fIFILE\fR. The default value is standard output.
|
|
+
|
|
+.TP
|
|
+--isolinux
|
|
+Assume that the input file is an isolinux configuration file.
|
|
+
|
|
+.TP
|
|
+--pxelinux
|
|
+Assume that the input file is a pxelinux configuration file.
|
|
+
|
|
+.TP
|
|
+--syslinux
|
|
+Assume that the input file is a syslinux configuration file.
|
|
+
|
|
+.SH SEE ALSO
|
|
+.BR "info grub"
|