[grub2] Manually patch this to make it look like the changes from F17. Ugh.
Peter Jones
pjones at fedoraproject.org
Thu Mar 29 17:51:20 UTC 2012
commit 820140e8ac4c3a240f1e2e2d0aa0fad9b65f814f
Author: Peter Jones <pjones at redhat.com>
Date: Thu Mar 29 13:50:57 2012 -0400
Manually patch this to make it look like the changes from F17. Ugh.
grub-1.99-ppc-terminfo.patch | 17 +++++++++--------
grub2.spec | 15 +++++++++++----
2 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/grub-1.99-ppc-terminfo.patch b/grub-1.99-ppc-terminfo.patch
index 2b8c380..b2b0d78 100644
--- a/grub-1.99-ppc-terminfo.patch
+++ b/grub-1.99-ppc-terminfo.patch
@@ -1,9 +1,10 @@
-From ad101ca2bd8913b989cc759bf36632c94381fc4e Mon Sep 17 00:00:00 2001
+From e263907f50e496e602edd9bd846ccb6e0565a085 Mon Sep 17 00:00:00 2001
From: Mark Hamzy <hamzy at us.ibm.com>
-Date: Thu, 1 Mar 2012 21:18:20 -0600
+Date: Wed, 28 Mar 2012 14:46:41 -0500
Subject: [PATCH] Migrate PPC from Yaboot to Grub2
-Add configuration support for serial terminal consoles. This will set the maximum screen size so that text is not overwritten.
+Add configuration support for serial terminal consoles. This will set the
+maximum screen size so that text is not overwritten.
---
Makefile.util.def | 7 +++
@@ -12,10 +13,10 @@ Add configuration support for serial terminal consoles. This will set the maxim
create mode 100644 util/grub.d/20_ppc_terminfo.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index 058572f..1993f9b 100644
+index c41b76e..b349758 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
-@@ -360,6 +360,13 @@ script = {
+@@ -423,6 +423,13 @@ script = {
};
script = {
@@ -31,7 +32,7 @@ index 058572f..1993f9b 100644
installdir = grubconf;
diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
new file mode 100644
-index 0000000..545ad62
+index 0000000..10d6658
--- /dev/null
+++ b/util/grub.d/20_ppc_terminfo.in
@@ -0,0 +1,114 @@
@@ -58,7 +59,7 @@ index 0000000..545ad62
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
-+. ${libdir}/grub/grub-mkconfig_lib
++. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+
+export TEXTDOMAIN=@PACKAGE@
+export TEXTDOMAINDIR=@localedir@
@@ -150,5 +151,5 @@ index 0000000..545ad62
+ terminfo -g ${X}x${Y} ${TERMINAL}
+EOF
--
-1.7.7.6
+1.7.7.2
diff --git a/grub2.spec b/grub2.spec
index 660973d..d11aac4 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -21,8 +21,8 @@
Name: grub2
Epoch: 1
-Version: 1.99
-Release: 19%{?dist}.2
+Version: 2.0
+Release: 0.21%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@@ -59,9 +59,8 @@ Requires: gettext os-prober which
Requires(pre): dracut
Requires(post): dracut
-# TODO: ppc
# ExclusiveArch: %{ix86} x86_64 %{sparc}
-ExcludeArch: s390 s390x ppc64
+ExcludeArch: s390 s390x
%description
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@@ -385,6 +384,14 @@ fi
%attr(0755,root,root)/%{_datarootdir}/grub/
%changelog
+* Thu Mar 29 2012 Peter Jones <pjones at redhat.com> - 2.0-0.21
+- Remove ppc excludearch lines (dwa)
+- Update ppc terminfo patch (hamzy)
+
+* Wed Mar 28 2012 Peter Jones <pjones at redhat.com> - 2.0-0.20
+- Fix ppc64 vs ppc exclude according to what dwa tells me they need
+- Fix version number to better match policy.
+
* Tue Mar 27 2012 Dan HorĂ¡k <dan[at]danny.cz> - 1.99-19.2
- Add support for serial terminal consoles on PPC by Mark Hamzy
More information about the scm-commits
mailing list