From 2df3e5efbaebe7d72ea72bf45dccea16a81c62d0 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Thu, 10 May 2012 02:44:58 +0200 Subject: [PATCH] Update to grub 2.0 beta 5 --- grub-2.00-beta4-wronly.patch | 29 ----------------------------- grub2.spec | 5 ++--- sources | 2 +- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 grub-2.00-beta4-wronly.patch diff --git a/grub-2.00-beta4-wronly.patch b/grub-2.00-beta4-wronly.patch deleted file mode 100644 index 90b9c590..00000000 --- a/grub-2.00-beta4-wronly.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8e4aea82c6aba6b8b5ca68d74abafa3fe9486c36 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 19 Apr 2012 14:17:38 -0400 -Subject: [PATCH] Open device O_WRONLY in grub_util_biosdisk_write. - -revision 4225 introduced an error wherein the device we intend -to write to from e.g. grub2-bios-setup is opened read-only. The -immediate following write(2) call then fails with -EBADF. - ---- - grub-core/kern/emu/hostdisk.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c -index ea7eb3d..19748df 100644 ---- a/grub-core/kern/emu/hostdisk.c -+++ b/grub-core/kern/emu/hostdisk.c -@@ -1081,7 +1081,7 @@ grub_util_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector, - { - int fd; - grub_disk_addr_t max = ~0ULL; -- fd = open_device (disk, sector, O_RDONLY, &max); -+ fd = open_device (disk, sector, O_WRONLY, &max); - if (fd < 0) - return grub_errno; - --- -1.7.10 - diff --git a/grub2.spec b/grub2.spec index 16baf404..ab82dbb0 100644 --- a/grub2.spec +++ b/grub2.spec @@ -16,13 +16,13 @@ %endif -%global tarversion 2.00~beta4 +%global tarversion 2.00~beta5 %undefine _missing_build_ids_terminate_build Name: grub2 Epoch: 1 Version: 2.0 -Release: 0.25.beta4%{?dist} +Release: 0.26.beta5%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -40,7 +40,6 @@ Patch2: grub-1.99-just-say-linux.patch Patch3: grub2-handle-initramfs-on-xen.patch Patch4: grub-1.99-Fix-tests-of-zeroed-partition.patch Patch5: grub-1.99-ppc-terminfo.patch -Patch6: grub-2.00-beta4-wronly.patch Patch7: grub-2.00~beta4-add-support-for-PowerMac-HFS-partitions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index 2192e2a6..f8ba959e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz -6902a2b408038b8d3263a86536ac4652 grub-2.00~beta4.tar.xz df14bd3ee8942d1cc6942859eb6bcb14 theme.tar.bz2 +be6c65c7d43991129b410942489c35ec grub-2.00~beta5.tar.xz