From 2511f6a2002d978fcee8a6045267116dcf20f538 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 18 May 2011 11:52:42 +0100 Subject: [PATCH] Drop boot_blocklist_hack.patch, fixed differently upstream some time ago by being smarter about filesystem-root-relative path conversion. --- debian/changelog | 2 ++ debian/patches/boot_blocklist_hack.patch | 20 -------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 debian/patches/boot_blocklist_hack.patch diff --git a/debian/changelog b/debian/changelog index 4045d4b22..73cd6eff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ grub2 (1.99-3) UNRELEASED; urgency=low * Ship grub-mkrescue on non-Linux amd64/i386 architectures. * Don't try to ship grub-mkrescue on sparc. + * Drop boot_blocklist_hack.patch, fixed differently upstream some time ago + by being smarter about filesystem-root-relative path conversion. -- Colin Watson Wed, 18 May 2011 09:51:55 +0100 diff --git a/debian/patches/boot_blocklist_hack.patch b/debian/patches/boot_blocklist_hack.patch deleted file mode 100644 index 7516dc215..000000000 --- a/debian/patches/boot_blocklist_hack.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: b/util/grub-setup.c -=================================================================== ---- a/util/grub-setup.c -+++ b/util/grub-setup.c -@@ -540,6 +540,15 @@ - - grub_file_filter_disable_compression (); - file = grub_file_open (core_path_dev); -+ -+ if (grub_errno == GRUB_ERR_FILE_NOT_FOUND) -+ { -+ /* Clean the previous grub_errno */ -+ grub_errno = GRUB_ERR_NONE; -+ strcpy (core_path_dev, "/grub/core.img"); -+ file = grub_file_open (core_path_dev); -+ } -+ - if (file) - { - if (grub_file_size (file) != core_size) diff --git a/debian/patches/series b/debian/patches/series index 33909e528..904aece2e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ olpc_prefix_hack.patch core_in_fs.patch dpkg_version_comparison.patch -boot_blocklist_hack.patch grub_legacy_0_based_partitions.patch disable_floppies.patch grub.cfg_400.patch