summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-11 23:25:18 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-11 23:25:18 -0300
commit575127b3d909f886e87526c3e9369fe690d862c2 (patch)
tree7c0226cbd7787f0258cc8d5d78117ec3610b1547
parentc6faf25856d75adaf83cf8f74baa775c1d2839dd (diff)
downloadabslibre-575127b3d909f886e87526c3e9369fe690d862c2.tar.gz
abslibre-575127b3d909f886e87526c3e9369fe690d862c2.tar.bz2
abslibre-575127b3d909f886e87526c3e9369fe690d862c2.zip
grub-1:2.02.beta2-3: remove 09_parabola config
-rw-r--r--libre/grub/PKGBUILD20
-rw-r--r--libre/grub/grub-10_linux-detect-parabola-initramfs.patch54
-rw-r--r--libre/grub/grub-10_linux-rebrand-free-distros.patch (renamed from libre/grub/10_linux.in.patch)0
3 files changed, 65 insertions, 9 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index ecf9bade2..b7b7b80bd 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -15,7 +15,7 @@ _UNIFONT_VER="6.3.20131217"
pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
pkgver=2.02.beta2
-pkgrel=2.1
+pkgrel=3
epoch="1"
url="https://www.gnu.org/software/grub/"
arch=('x86_64' 'i686')
@@ -43,22 +43,23 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}
"grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master"
"http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"
"http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig"
+ 'grub-10_linux-detect-parabola-initramfs.patch'
'grub-add-GRUB_COLOR_variables.patch'
- '09_parabola'
'60_memtest86+'
'grub.default'
- '10_linux.in.patch')
+ 'grub-10_linux-rebrand-free-distros.patch')
+
md5sums=('SKIP'
'SKIP'
'728b7439ac733a7c0d56049adec364c7'
'SKIP'
+ '945527e0de8d384166a4cf23439ae9ee'
'e506ae4a9f9f7d1b765febfa84e10d48'
- '9f67330f2979a153acb32af706e0c094'
'be55eabc102f2c60b38ed35c203686d6'
'52d374e0194e3f2e39ff7c92ecd58a6c'
'b23a144b7001c88734b79ed3bec491c4')
-pkgver() {
+_pkgver() {
cd "${srcdir}/grub-${_pkgver}/"
echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
}
@@ -67,6 +68,10 @@ prepare() {
cd "${srcdir}/grub-${_pkgver}/"
+ msg "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig"
+ patch -Np1 -i "${srcdir}/grub-10_linux-detect-parabola-initramfs.patch"
+ echo
+
msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig"
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch"
@@ -76,7 +81,7 @@ prepare() {
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
msg "Rebranding for some free distros"
- patch -Np1 -i "${srcdir}/10_linux.in.patch"
+ patch -Np1 -i "${srcdir}/grub-10_linux-rebrand-free-distros.patch"
echo
msg "Fix mkinitcpio 'rw' FS#36275"
@@ -237,9 +242,6 @@ _package_grub-common_and_bios() {
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
- msg "Install 09_parabola helper script for grub-mkconfig"
- install -D -m0755 "${srcdir}/09_parabola" "${pkgdir}/etc/grub.d/09_parabola"
-
msg "Install extra /etc/grub.d/ files"
install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
new file mode 100644
index 000000000..18d9d520c
--- /dev/null
+++ b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
@@ -0,0 +1,54 @@
+From b470ffd22e43acc7c11231180187a720efd88de1 Mon Sep 17 00:00:00 2001
+From: Keshav Amburay <the.ridikulus.rat@gmail.com>
+Date: Sat, 5 Apr 2014 20:40:51 -0400
+Subject: [PATCH] 10_linux: Detect Arch Linux main and fallback initramfs
+ images
+
+---
+ util/grub.d/10_linux.in | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 00d1931..7d4086b 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -81,6 +81,8 @@ linux_entry ()
+ case $type in
+ recovery)
+ title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
++ fallback)
++ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
+ *)
+ title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ esac
+@@ -180,7 +182,7 @@ while [ "x$list" != "x" ] ; do
+ basename=`basename $linux`
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
++ version=`echo $basename | sed -e "s,vmlinuz-,,g"`
+ alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+@@ -236,6 +238,18 @@ while [ "x$list" != "x" ] ; do
+
+ linux_entry "${OS}" "${version}" advanced \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++
++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
++ initrd="initramfs-${version}-fallback.img"
++
++ if test -n "${initrd}" ; then
++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2
++ fi
++
++ linux_entry "${OS}" "${version}" fallback \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ fi
++
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" recovery \
+ "single ${GRUB_CMDLINE_LINUX}"
+--
+1.9.1
+
diff --git a/libre/grub/10_linux.in.patch b/libre/grub/grub-10_linux-rebrand-free-distros.patch
index c9285e699..c9285e699 100644
--- a/libre/grub/10_linux.in.patch
+++ b/libre/grub/grub-10_linux-rebrand-free-distros.patch