2764c99fe0
I think it is good time to update to 2.02 so it can get more testing. Although internal changes are pretty extensive, externally it should be pretty much the same. The main user visible changes are - autogen is not used anymore, so we can finally simplify patches and recreate files during RPM build. So generated files need not be patched and shipped any more. - GRUB_HIDDEN_TIMEOUT is deprecated, we should use GRUB_TIMEOUT_STYLE instead. This will need perl-Bootloader and YaST changes. Old config is still accpepted so nothing should be broken. - native pvgrub2 support for Xen PV guests. - ARM support (32 and 64 bit), although it has rough edges. OBS-URL: https://build.opensuse.org/request/show/212604 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=62
122 lines
4.6 KiB
Diff
122 lines
4.6 KiB
Diff
From 031abf80020b2fa75850d6e09f4489b687a5cb19 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Slaby <jirislaby@gmail.com>
|
|
Date: Sun, 24 Jun 2012 15:40:40 +0200
|
|
Subject: [PATCH] rename grub info file to grub2
|
|
|
|
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
|
|
|
|
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
Do not rename file here. quilt does not support it and creates the
|
|
whole file if patch needs refreshing. It means that to regenerate two
|
|
files - Makefile.core.am and Makefile.util.am - it may be necessary to
|
|
manually rename it.
|
|
---
|
|
|
|
Index: grub-2.02~beta1/docs/Makefile.am
|
|
===================================================================
|
|
--- grub-2.02~beta1.orig/docs/Makefile.am
|
|
+++ grub-2.02~beta1/docs/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
AUTOMAKE_OPTIONS = subdir-objects
|
|
|
|
# AM_MAKEINFOFLAGS = --no-split --no-validate
|
|
-info_TEXINFOS = grub.texi grub-dev.texi
|
|
+info_TEXINFOS = grub2.texi grub-dev.texi
|
|
grub_TEXINFOS = fdl.texi
|
|
|
|
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
|
|
Index: grub-2.02~beta1/docs/Makefile.in
|
|
===================================================================
|
|
--- grub-2.02~beta1.orig/docs/Makefile.in
|
|
+++ grub-2.02~beta1/docs/Makefile.in
|
|
@@ -79,7 +79,7 @@ host_triplet = @host@
|
|
target_triplet = @target@
|
|
subdir = docs
|
|
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
|
- $(grub_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \
|
|
+ $(top_srcdir)/build-aux/mdate-sh \
|
|
$(srcdir)/version.texi $(srcdir)/stamp-vti \
|
|
$(srcdir)/version-dev.texi $(srcdir)/stamp-1 \
|
|
$(top_srcdir)/build-aux/texinfo.tex mdate-sh texinfo.tex
|
|
@@ -184,14 +184,14 @@ AM_V_texidevnull = $(am__v_texidevnull_@
|
|
am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
|
|
am__v_texidevnull_0 = > /dev/null
|
|
am__v_texidevnull_1 =
|
|
-INFO_DEPS = $(srcdir)/grub.info $(srcdir)/grub-dev.info
|
|
+INFO_DEPS = $(srcdir)/grub2.info $(srcdir)/grub-dev.info
|
|
TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
|
|
am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
|
|
-DVIS = grub.dvi grub-dev.dvi
|
|
-PDFS = grub.pdf grub-dev.pdf
|
|
-PSS = grub.ps grub-dev.ps
|
|
-HTMLS = grub.html grub-dev.html
|
|
-TEXINFOS = grub.texi grub-dev.texi
|
|
+DVIS = grub2.dvi grub-dev.dvi
|
|
+PDFS = grub2.pdf grub-dev.pdf
|
|
+PSS = grub2.ps grub-dev.ps
|
|
+HTMLS = grub2.html grub-dev.html
|
|
+TEXINFOS = grub2.texi grub-dev.texi
|
|
TEXI2DVI = texi2dvi
|
|
TEXI2PDF = $(TEXI2DVI) --pdf --batch
|
|
MAKEINFOHTML = $(MAKEINFO) --html
|
|
@@ -1068,7 +1068,7 @@ top_srcdir = @top_srcdir@
|
|
AUTOMAKE_OPTIONS = subdir-objects
|
|
|
|
# AM_MAKEINFOFLAGS = --no-split --no-validate
|
|
-info_TEXINFOS = grub.texi grub-dev.texi
|
|
+info_TEXINFOS = grub2.texi grub-dev.texi
|
|
grub_TEXINFOS = fdl.texi
|
|
EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
|
|
all: all-am
|
|
@@ -1149,14 +1149,14 @@ $(am__aclocal_m4_deps):
|
|
else \
|
|
rm -rf $(@:.html=.htp); exit 1; \
|
|
fi
|
|
-$(srcdir)/grub.info: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
-grub.dvi: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
-grub.pdf: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
-grub.html: grub.texi $(srcdir)/version.texi $(grub_TEXINFOS)
|
|
+$(srcdir)/grub2.info: grub2.texi $(srcdir)/version.texi
|
|
+grub2.dvi: grub2.texi $(srcdir)/version.texi
|
|
+grub2.pdf: grub2.texi $(srcdir)/version.texi
|
|
+grub2.html: grub2.texi $(srcdir)/version.texi
|
|
$(srcdir)/version.texi: $(srcdir)/stamp-vti
|
|
-$(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure
|
|
- @(dir=.; test -f ./grub.texi || dir=$(srcdir); \
|
|
- set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub.texi`; \
|
|
+$(srcdir)/stamp-vti: grub2.texi $(top_srcdir)/configure
|
|
+ @(dir=.; test -f ./grub2.texi || dir=$(srcdir); \
|
|
+ set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/grub2.texi`; \
|
|
echo "@set UPDATED $$1 $$2 $$3"; \
|
|
echo "@set UPDATED-MONTH $$2 $$3"; \
|
|
echo "@set EDITION $(VERSION)"; \
|
|
@@ -1276,12 +1276,12 @@ dist-info: $(INFO_DEPS)
|
|
done
|
|
|
|
mostlyclean-aminfo:
|
|
- -rm -rf grub.t2d grub.t2p grub-dev.t2d grub-dev.t2p
|
|
+ -rm -rf grub2.t2d grub2.t2p grub-dev.t2d grub-dev.t2p
|
|
|
|
clean-aminfo:
|
|
- -test -z "grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \
|
|
+ -test -z "grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \
|
|
grub-dev.ps grub-dev.html" \
|
|
- || rm -rf grub.dvi grub.pdf grub.ps grub.html grub-dev.dvi grub-dev.pdf \
|
|
+ || rm -rf grub2.dvi grub2.pdf grub2.ps grub2.html grub-dev.dvi grub-dev.pdf \
|
|
grub-dev.ps grub-dev.html
|
|
|
|
maintainer-clean-aminfo:
|
|
Index: grub-2.02~beta1/docs/grub.texi
|
|
===================================================================
|
|
--- grub-2.02~beta1.orig/docs/grub.texi
|
|
+++ grub-2.02~beta1/docs/grub.texi
|
|
@@ -1,7 +1,7 @@
|
|
\input texinfo
|
|
@c -*-texinfo-*-
|
|
@c %**start of header
|
|
-@setfilename grub.info
|
|
+@setfilename grub2.info
|
|
@include version.texi
|
|
@settitle GNU GRUB Manual @value{VERSION}
|
|
@c Unify all our little indices for now.
|