mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
Fixes for ppc
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
parent
b87b26e070
commit
b577e7c89e
3 changed files with 37 additions and 5 deletions
|
@ -0,0 +1,27 @@
|
||||||
|
From 8b424dd42b64453e50a49a4c6fc455584f931b46 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fedora Ninjas <pjones@fedoraproject.org>
|
||||||
|
Date: Thu, 23 Jun 2011 00:08:03 +0400
|
||||||
|
Subject: [PATCH] Workaround for 'variable set but not used' issue
|
||||||
|
|
||||||
|
Signed-off-by: Fedora Ninjas <pjones@fedoraproject.org>
|
||||||
|
---
|
||||||
|
grub-core/lib/relocator.c | 3 +++
|
||||||
|
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
|
||||||
|
index dbd5fe4..606b545 100644
|
||||||
|
--- a/grub-core/lib/relocator.c
|
||||||
|
+++ b/grub-core/lib/relocator.c
|
||||||
|
@@ -1010,6 +1010,9 @@ malloc_in_range (struct grub_relocator *rel,
|
||||||
|
= ALIGN_UP (alloc_end,
|
||||||
|
GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
|
||||||
|
|
||||||
|
+ grub_dprintf ("relocator", "requesting %lx-%lx\n",
|
||||||
|
+ (unsigned long) fstart,
|
||||||
|
+ (unsigned long) fend);
|
||||||
|
#if GRUB_RELOCATOR_HAVE_LEFTOVERS
|
||||||
|
{
|
||||||
|
struct grub_relocator_fw_leftover *lo1 = NULL;
|
||||||
|
--
|
||||||
|
1.7.5.1
|
||||||
|
|
14
grub2.spec
14
grub2.spec
|
@ -19,7 +19,7 @@ Name: grub2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.99
|
Version: 1.99
|
||||||
%define filever 1.99~rc1
|
%define filever 1.99~rc1
|
||||||
Release: 0.1%{?dist}
|
Release: 0.2%{?dist}
|
||||||
Summary: Bootloader with support for Linux, Multiboot and more
|
Summary: Bootloader with support for Linux, Multiboot and more
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
|
@ -33,6 +33,7 @@ Patch0: grub-1.99-handle-fwrite-return.patch
|
||||||
Patch1: grub-1.99-unused-variable.patch
|
Patch1: grub-1.99-unused-variable.patch
|
||||||
Patch2: grub-1.99-grub_test_assert_printf.patch
|
Patch2: grub-1.99-grub_test_assert_printf.patch
|
||||||
Patch3: grub-1.99-just-say-linux.patch
|
Patch3: grub-1.99-just-say-linux.patch
|
||||||
|
Patch4: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
@ -127,7 +128,7 @@ cd grub-%{filever}
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
# -static is needed so that autoconf script is able to link
|
# -static is needed so that autoconf script is able to link
|
||||||
# test that looks for _start symbol on 64 bit platforms
|
# test that looks for _start symbol on 64 bit platforms
|
||||||
%ifarch %{sparc}
|
%ifarch %{sparc} ppc ppc64
|
||||||
PLATFORM=ieee1275
|
PLATFORM=ieee1275
|
||||||
%else
|
%else
|
||||||
PLATFORM=pc
|
PLATFORM=pc
|
||||||
|
@ -241,7 +242,9 @@ rm -f /boot/%{name}/device.map
|
||||||
%{_sbindir}/%{name}-probe
|
%{_sbindir}/%{name}-probe
|
||||||
%{_sbindir}/%{name}-reboot
|
%{_sbindir}/%{name}-reboot
|
||||||
%{_sbindir}/%{name}-set-default
|
%{_sbindir}/%{name}-set-default
|
||||||
|
%ifarch %{ix86} x86_64 %{sparc}
|
||||||
%{_sbindir}/%{name}-setup
|
%{_sbindir}/%{name}-setup
|
||||||
|
%endif
|
||||||
%{_bindir}/%{name}-bin2h
|
%{_bindir}/%{name}-bin2h
|
||||||
%{_bindir}/%{name}-editenv
|
%{_bindir}/%{name}-editenv
|
||||||
%{_bindir}/%{name}-fstest
|
%{_bindir}/%{name}-fstest
|
||||||
|
@ -303,10 +306,10 @@ rm -f /boot/%{name}/device.map
|
||||||
# %{_bindir}/grub2-efi-mkisofs
|
# %{_bindir}/grub2-efi-mkisofs
|
||||||
%{_bindir}/grub2-efi-mkpasswd-pbkdf2
|
%{_bindir}/grub2-efi-mkpasswd-pbkdf2
|
||||||
%{_bindir}/grub2-efi-mkrelpath
|
%{_bindir}/grub2-efi-mkrelpath
|
||||||
%ifnarch %{sparc}
|
%ifnarch %{sparc} ppc ppc64
|
||||||
%{_bindir}/grub2-efi-mkrescue
|
%{_bindir}/grub2-efi-mkrescue
|
||||||
%endif
|
%endif
|
||||||
%ifarch %{sparc}
|
%ifarch %{sparc} ppc ppc64
|
||||||
%{_sbindir}/grub2-efi-ofpathname
|
%{_sbindir}/grub2-efi-ofpathname
|
||||||
%endif
|
%endif
|
||||||
%{_bindir}/grub2-efi-script-check
|
%{_bindir}/grub2-efi-script-check
|
||||||
|
@ -327,6 +330,9 @@ rm -f /boot/%{name}/device.map
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 23 2011 Peter Lemenkov <lemenkov@gmail.com> - 1:1.99-0.2
|
||||||
|
- Fixes for ppc and ppc64
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.98-4
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.98-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
|
1
sources
1
sources
|
@ -1,2 +1 @@
|
||||||
c0bcf60e524739bb64e3a2d4e3732a59 grub-1.98.tar.gz
|
|
||||||
fd602ffaada5ba7939d0ea47091841a5 grub-1.99~rc1.tar.gz
|
fd602ffaada5ba7939d0ea47091841a5 grub-1.99~rc1.tar.gz
|
||||||
|
|
Loading…
Reference in a new issue