summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/grub2/05_archtheme (renamed from libre-testing/grub2/05_archtheme)0
-rw-r--r--libre/grub2/20_memtest86+ (renamed from libre-testing/grub2/20_memtest86+)0
-rw-r--r--libre/grub2/PKGBUILD (renamed from libre-testing/grub2/PKGBUILD)4
-rw-r--r--libre/grub2/archlinux_grub2_mkconfig_fixes.patch (renamed from libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch)0
-rw-r--r--libre/grub2/grub.cfg (renamed from libre-testing/grub2/grub.cfg)0
-rw-r--r--libre/grub2/grub.default (renamed from libre-testing/grub2/grub.default)2
-rw-r--r--libre/grub2/grub2.install (renamed from libre-testing/grub2/grub2.install)0
7 files changed, 3 insertions, 3 deletions
diff --git a/libre-testing/grub2/05_archtheme b/libre/grub2/05_archtheme
index 4d1b6fb20..4d1b6fb20 100644
--- a/libre-testing/grub2/05_archtheme
+++ b/libre/grub2/05_archtheme
diff --git a/libre-testing/grub2/20_memtest86+ b/libre/grub2/20_memtest86+
index 41ca11f02..41ca11f02 100644
--- a/libre-testing/grub2/20_memtest86+
+++ b/libre/grub2/20_memtest86+
diff --git a/libre-testing/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index 30ab7e893..6d884dcea 100644
--- a/libre-testing/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -11,7 +11,7 @@ _grub2_915_ver=6
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase="grub2"
pkgver='1.99~rc1'
-pkgrel=3
+pkgrel=4
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -198,7 +198,7 @@ md5sums=('fd602ffaada5ba7939d0ea47091841a5'
'0a124ffc9835100ba0e7de7a0ac1c389'
'0016761d429e6a77b90d09ed6ee8a47d'
'93f0f96911451e86014e04f96e13462f'
- 'ff99d316b0c59e514e5bb641a392d330'
+ '50123c37cf145a98aba4ffb0fc4efba1'
'7cb90ebb04b856ded6ae171c3658fba2'
'5a07e04c4ecb8ed145d54fec3043e0d5'
'e143ae2e453b7c3ced309667df30da55')
diff --git a/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch
index 62acd2ee8..62acd2ee8 100644
--- a/libre-testing/grub2/archlinux_grub2_mkconfig_fixes.patch
+++ b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch
diff --git a/libre-testing/grub2/grub.cfg b/libre/grub2/grub.cfg
index 1f0e41471..1f0e41471 100644
--- a/libre-testing/grub2/grub.cfg
+++ b/libre/grub2/grub.cfg
diff --git a/libre-testing/grub2/grub.default b/libre/grub2/grub.default
index e150e3af0..8302bdb3f 100644
--- a/libre-testing/grub2/grub.default
+++ b/libre/grub2/grub.default
@@ -27,7 +27,7 @@ GRUB_CMDLINE_LINUX=""
#GRUB_DISABLE_LINUX_UUID=true
# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_LINUX_RECOVERY="true"
+#GRUB_DISABLE_RECOVERY="true"
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
# modes only. Entries specified as foreground/background.
diff --git a/libre-testing/grub2/grub2.install b/libre/grub2/grub2.install
index 898dc9246..898dc9246 100644
--- a/libre-testing/grub2/grub2.install
+++ b/libre/grub2/grub2.install