grub-parabola: add parabola suffix for the package

13 files changed, 0 insertions, 1109 deletions

diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
deleted file mode 100644
index e043633af..000000000
--- a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Fri, 28 Dec 2012 06:43:35 +0000
-Subject: [PATCH 069/364] Backport gnulib fixes for C11.  Fixes Savannah bug
- #37738.
-
-* grub-core/gnulib/stdio.in.h (gets): Warn on use only if
-HAVE_RAW_DECL_GETS.
-* m4/stdio_h.m4 (gl_STDIO_H): Check for gets.
----
- ChangeLog                   | 8 ++++++++
- grub-core/gnulib/stdio.in.h | 6 ++++--
- m4/stdio_h.m4               | 2 +-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
-index 80b9dbf..a8b00c6 100644
---- a/grub-core/gnulib/stdio.in.h
-+++ b/grub-core/gnulib/stdio.in.h
-@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- #endif
- 
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
- #undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
-index f5650cd..8458bec 100644
---- a/m4/stdio_h.m4
-+++ b/m4/stdio_h.m4
-@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H],
-   dnl corresponding gnulib module is not in use, and which is not
-   dnl guaranteed by C89.
-   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
--    ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat
-+    ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
-     snprintf tmpfile vdprintf vsnprintf])
- ])
- 
--- 
-1.8.1.4
-
diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola
deleted file mode 100644
index 90a9062a3..000000000
--- a/libre/grub/09_parabola
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env bash
-
-##
-## grub-mkconfig helper script specific to Parabola GNU/Linux-libre
-## Contributed by "Keshav Amburay" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm>
-## Rebranded for Parabola by "André Silva" <emulatorman@parabola.nu>
-## Updated on 08 February 2014
-##
-## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script 
-## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream
-##
-## This script can be freely distributed and/or modified 
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This script is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-
-_FUNC_GRUB_FILE_PRESENT() {
-    
-    [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86"
-    
-    if [[ "${GRUB_PLATFORM}" == "x86" ]]; then
-        check="--is-x86-linux32"
-    elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then
-        check="--is-i386-xen-pae-domu"
-    elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then
-        check="--is-x86_64-xen-domu"
-    else
-        check="--is-${GRUB_PLATFORM}-linux"
-    fi
-    
-    case "${GRUB_PLATFORM}" in
-        x86)
-            list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do
-                        if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi
-                    done)" ;;
-        *) 
-          list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do
-                      if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi
-                  done)" ;;
-    esac
-}
-
-set -e
-
-prefix="/usr"
-exec_prefix="${prefix}"
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-sysconfdir="/etc"
-
-. "${datarootdir}/grub/grub-mkconfig_lib"
-
-. "${sysconfdir}/default/grub"
-
-export TEXTDOMAIN="grub"
-export TEXTDOMAINDIR="${datarootdir}/locale"
-
-CLASS="--class parabola --class gnu-linux --class gnu --class os"
-
-[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT
-
-BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)"
-BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)"
-BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)"
-
-ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)"
-ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")"
-
-if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then
-    
-    case "${ROOT_PART_FS}" in
-        btrfs)
-            rootsubvol="$(make_system_path_relative_to_its_root /)"
-            rootsubvol="${rootsubvol#/}"
-            if [[ "${rootsubvol}" != "" ]]; then
-                GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}"
-            fi
-        ;;
-        zfs)
-            rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)"
-            bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")"
-            GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
-        ;;
-    esac
-    
-    if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \
-       [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \
-       [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \
-       uses_abstraction "${GRUB_DEVICE}" lvm ; then
-           GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}"
-    else
-       GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}"
-    fi
-fi
-
-[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-
-for _KERNEL_ in ${list} ; do
-    
-    echo "Found linux image: ${_KERNEL_}" >&2
-    
-    basename="$(basename "${_KERNEL_}")"
-    dirname="$(dirname "${_KERNEL_}")"
-    REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")"
-  
-    _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')"
-    _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')"
-    
-    _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img"
-    
-    if [[ -e "/boot/${_INITRAMFS_}" ]]; then
-    
-    echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2
-    
-cat << EOF
-
-menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} {
-    $(save_default_entry)
-    if [ x\$feature_all_video_module = xy ]; then
-        insmod all_video
-    fi
-    set gfxpayload=keep
-    insmod ${BOOT_PART_FS}
-    if [ x\$feature_platform_search_hint = xy ]; then
-        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID}
-    else
-        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_FS_UUID}
-    fi
-    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...'
-    linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
-    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...'
-    initrd ${REAL_DIR}/${_INITRAMFS_}
-}
-
-EOF
-    fi
-    
-    _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img"
-    
-    if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then
-    
-    echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2
-    
-cat << EOF
-
-menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} {
-    $(save_default_entry)
-    if [ x\$feature_all_video_module = xy ]; then
-        insmod all_video
-    fi
-    set gfxpayload=keep
-    insmod ${BOOT_PART_FS}
-    if [ x\$feature_platform_search_hint = xy ]; then
-        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID}
-    else
-        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_FS_UUID}
-    fi
-    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...'
-    linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
-    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...'
-    initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_}
-}
-
-EOF
-    fi
-    
-    if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then
-cat << EOF
-
-menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} {
-    $(save_default_entry)
-    if [ x\$feature_all_video_module = xy ]; then
-        insmod all_video
-    fi
-    set gfxpayload=keep
-    insmod ${BOOT_PART_FS}
-    if [ x\$feature_platform_search_hint = xy ]; then
-        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID}
-    else
-        search --no-floppy --fs-uuid  --set=root ${BOOT_PART_FS_UUID}
-    fi
-    echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...'
-    linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
-}
-
-EOF
-    fi
-    
-done
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
deleted file mode 100644
index 086f0cc84..000000000
--- a/libre/grub/60_memtest86+
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system.               #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/grub/grub-mkconfig_lib"
-
-MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
-CLASS="--class memtest86 --class gnu --class tool"
-
-if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
-    ## image exists, create menu entry
-    echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
-    _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
-    _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
-    _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
-    cat << EOF
-if [ "\${grub_platform}" == "pc" ]; then
-    menuentry "Memory Tester (memtest86+)" ${CLASS} {
-        search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
-        linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
-    }
-fi
-EOF
-fi
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
deleted file mode 100644
index 213e7dee0..000000000
--- a/libre/grub/PKGBUILD
+++ /dev/null
@@ -1,384 +0,0 @@
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
-# Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Márcio Silva <coadde@parabola.nu>
-
-## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
-_IA32_EFI_IN_ARCH_X64="1"
-
-## "1" to enable EMU build, "0" to disable
-_GRUB_EMU_BUILD="0"
-
-_pkgver="2.02"
-_GRUB_GIT_TAG="grub-2.02-beta2"
-
-_UNIFONT_VER="6.3.20131217"
-
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
-
-[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
-
-pkgname="grub"
-pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
-pkgver=2.02.beta2
-pkgrel=4
-epoch="1"
-url="https://www.gnu.org/software/grub/"
-arch=('x86_64' 'i686')
-license=('GPL3')
-backup=('etc/default/grub' 'etc/grub.d/40_custom')
-install="${pkgname}.install"
-options=('!makeflags')
-
-conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
-replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
-provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
-
-makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
-             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
-depends=('sh' 'xz' 'gettext' 'device-mapper')
-optdepends=('freetype2: For grub-mkfont usage'
-            'fuse: For grub-mount usage'
-            'dosfstools: For grub-mkrescue FAT FS and EFI support' 
-            'efibootmgr: For grub-install EFI support'
-            'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
-            'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
-            'mtools: For grub-mkrescue FAT FS support')
-
-if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
-    makedepends+=('libusbx' 'sdl')
-    optdepends+=('libusbx: For grub-emu USB support'
-                 'sdl: For grub-emu SDL support')
-fi
-
-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'
-        '60_memtest86+'
-        'grub.default'
-        'grub-10_linux-rebrand-free-distros.patch')
-
-md5sums=('SKIP'
-         'SKIP'
-         '728b7439ac733a7c0d56049adec364c7'
-         'SKIP'
-         '945527e0de8d384166a4cf23439ae9ee'
-         'e506ae4a9f9f7d1b765febfa84e10d48'
-         'be55eabc102f2c60b38ed35c203686d6'
-         '8d1dd54ae4a1b550c097e056892ce953'
-         'c8ac993bc9c0fe288c177a20630ccc46')
-
-_pkgver() {
-	cd "${srcdir}/grub-${_pkgver}/"
-	echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
-}
-
-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"
-	echo
-	
-	msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
-	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}/grub-10_linux-rebrand-free-distros.patch"
-        echo
-
-	msg "Fix mkinitcpio 'rw' FS#36275"
-	sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
-	
-	# msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3"
-	# sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
-	
-	msg "Pull in latest language files"
-	./linguas.sh
-	echo
-	
-	msg "Remove not working langs which need LC_ALL=C.UTF-8"
-	sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS"
-	
-	msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847"
-	cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
-	
-}
-
-_build_grub-common_and_bios() {
-	
-	msg "Set ARCH dependent variables for bios build"
-	if [[ "${CARCH}" == 'x86_64' ]]; then
-		_EFIEMU="--enable-efiemu"
-	else
-		_EFIEMU="--disable-efiemu"
-	fi
-	
-	msg "Copy the source for building the bios part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-	
-	msg "Add the grub-extra sources for bios build"
-	install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
-	cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution"
-	export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/"
-	
-	msg "Unset all compiler FLAGS for bios build"
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-	
-	msg "Run autogen.sh for bios build"
-	./autogen.sh
-	echo
-	
-	msg "Run ./configure for bios build"
-	./configure \
-		--with-platform="pc" \
-		--target="i386" \
-		"${_EFIEMU}" \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-boot-time \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/bin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-	 	--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-silent-rules \
-		--disable-werror
-	echo
-	
-	msg "Run make for bios build"
-	make
-	echo
-}
-
-_build_grub-efi() {
-	
-	msg "Copy the source for building the ${_EFI_ARCH} efi part"
-	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}"
-	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
-	
-	msg "Unset all compiler FLAGS for ${_EFI_ARCH} efi build"
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
-	
-	msg "Run autogen.sh for ${_EFI_ARCH} efi build"
-	./autogen.sh
-	echo
-	
-	msg "Run ./configure for ${_EFI_ARCH} efi build"
-	./configure \
-		--with-platform="efi" \
-		--target="${_EFI_ARCH}" \
-		--disable-efiemu \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-boot-time \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/bin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-		--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-silent-rules \
-		--disable-werror
-	echo
-	
-	msg "Run make for ${_EFI_ARCH} efi build"
-	make
-	echo
-	
-}
-
-_build_grub-emu() {
-	
-	msg "Copy the source for building the emu part"
-	cp -r "${srcdir}/grub-${_pkgver}/" "${srcdir}/grub-${_pkgver}-emu/"
-	
-	msg "Unset all compiler FLAGS for emu build"
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	cd "${srcdir}/grub-${_pkgver}-emu/"
-	
-	msg "Run autogen.sh for emu build"
-	./autogen.sh
-	echo
-	
-	msg "Run ./configure for emu build"
-	./configure \
-		--with-platform="emu" \
-		--target="${_EMU_ARCH}" \
-		--enable-mm-debug \
-		--enable-nls \
-		--enable-device-mapper \
-		--enable-cache-stats \
-		--enable-grub-mkfont \
-		--enable-grub-mount \
-		--enable-grub-emu-usb=no \
-		--enable-grub-emu-sdl=no \
-		--disable-grub-emu-pci \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--sbindir="/usr/bin" \
-		--mandir="/usr/share/man" \
-		--infodir="/usr/share/info" \
-		--datarootdir="/usr/share" \
-		--sysconfdir="/etc" \
-		--program-prefix="" \
-		--with-bootdir="/boot" \
-		--with-grubdir="grub" \
-		--disable-silent-rules \
-		--disable-werror
-	echo
-	
-	msg "Run make for emu build"
-	make
-	echo
-	
-}
-
-build() {
-	
-	cd "${srcdir}/grub-${_pkgver}/"
-	
-	msg "Build grub bios stuff"
-	_build_grub-common_and_bios
-	echo
-	
-	msg "Build grub ${_EFI_ARCH} efi stuff"
-	_build_grub-efi
-	echo
-	
-	if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
-		msg "Build grub i386 efi stuff"
-		_EFI_ARCH="i386" _build_grub-efi
-		echo
-	fi
-	
-	if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
-		msg "Build grub emu stuff"
-		_build_grub-emu
-		echo
-	fi
-    
-}
-
-_package_grub-common_and_bios() {
-	
-	cd "${srcdir}/grub-${_pkgver}-bios/"
-	
-	msg "Run make install for bios build"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-	echo
-	
-	msg "Remove gdb debugging related files for bios build"
-	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
-	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 extra /etc/grub.d/ files"
-	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
-	
-	msg "Install /etc/default/grub (used by grub-mkconfig)"
-	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-	
-	
-}
-
-_package_grub-efi() {
-	
-	cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/"
-	
-	msg "Run make install for ${_EFI_ARCH} efi build"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-	echo
-	
-	msg "Remove gdb debugging related files for ${_EFI_ARCH} efi build"
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
-	
-}
-
-_package_grub-emu() {
-	
-	cd "${srcdir}/grub-${_pkgver}-emu/"
-	
-	msg "Run make install for emu build"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-	echo
-	
-	msg "Remove gdb debugging related files for emu build"
-	rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true
-	
-}
-
-package() {
-	
-	cd "${srcdir}/grub-${_pkgver}/"
-	
-	msg "Package grub ${_EFI_ARCH} efi stuff"
-	_package_grub-efi
-	
-	if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
-		msg "Package grub i386 efi stuff"
-		_EFI_ARCH="i386" _package_grub-efi
-		echo
-	fi
-	
-	if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
-		msg "Package grub emu stuff"
-		_package_grub-emu
-		echo
-	fi
-	
-	msg "Package grub bios stuff"
-	_package_grub-common_and_bios
-	
-}
diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
deleted file mode 100644
index 18d9d520c..000000000
--- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/grub-10_linux-rebrand-free-distros.patch b/libre/grub/grub-10_linux-rebrand-free-distros.patch
deleted file mode 100644
index 7edb22a1f..000000000
--- a/libre/grub/grub-10_linux-rebrand-free-distros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 00d1931..23de7ce 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  else
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  fi
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch
deleted file mode 100644
index 0aa481154..000000000
--- a/libre/grub/grub-2.00-fix-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com
-Date: Tue, 12 Mar 2013 15:23:02 -0400
-Subject: [PATCH] Fix docs
-
-I think the doc generation tools got stricter, so fix up the .texi file
-to work.
-
-diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
---- a/docs/grub-dev.texi
-+++ b/docs/grub-dev.texi
-@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0,
- 
- @node Bitmap API
- @section Bitmap API
--@itemize
- @subsection grub_video_bitmap_create
-+@itemize
- @item Prototype:
- @example
- grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
deleted file mode 100644
index 1af848fa3..000000000
--- a/libre/grub/grub-2.00-mkinitcpio-0.15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/grub.d/10_linux.in.old	2013-07-28 08:55:47.825946239 +0200
-+++ util/grub.d/10_linux.in	2013-07-28 08:56:14.082201512 +0200
-@@ -138,7 +138,7 @@
-   message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
--	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
- EOF
-   if test -n "${initrd}" ; then
-     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
deleted file mode 100644
index 9a2eb3ff7..000000000
--- a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-There is no explicit option to turn off alignment; it is implicitly
-disabled if one of --separator or --nameprefixes option is used.
-
---separator was added in 2007, --nameprefixes - in 2009. So let's use
---separator to extend range of versions we are compatible with. Note that
-one or another must be used, current parsing is broken otherwise.
-
-Signed-off-by: Andrey Borzenkov <address@hidden>
-
----
- util/getroot.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/util/getroot.c b/util/getroot.c
-index 2ad8a55..3afcf96 100644
---- a/util/getroot.c
-+++ b/util/getroot.c
-@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev)
- static void
- pull_lvm_by_command (const char *os_dev)
- {
--  char *argv[6];
-+  char *argv[8];
-   int fd;
-   pid_t pid;
-   FILE *mdadm;
-@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev)
- 
-   /* execvp has inconvenient types, hence the casts.  None of these
-      strings will actually be modified.  */
-+  /* by default PV name is left aligned in 10 character field, meaning that
-+     we do not know where name ends. Using dummy --separator disables
-+     alignment. We have a single field, so separator itself is not output */
-   argv[0] = (char *) "vgs";
-   argv[1] = (char *) "--options";
-   argv[2] = (char *) "pv_name";
-   argv[3] = (char *) "--noheadings";
--  argv[4] = vgname;
--  argv[5] = NULL;
-+  argv[4] = (char *) "--separator";
-+  argv[5] = (char *) ":";
-+  argv[6] = vgname;
-+  argv[7] = NULL;
- 
-   pid = exec_pipe (argv, &fd);
-   free (vgname);
-@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev)
-   while (getline (&buf, &len, mdadm) > 0)
-     {
-       char *ptr;
-+      /* LVM adds two spaces as standard prefix */
-       for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++);
-       if (*ptr == '\0')
-        continue;
diff --git a/libre/grub/grub-add-GRUB_COLOR_variables.patch b/libre/grub/grub-add-GRUB_COLOR_variables.patch
deleted file mode 100644
index c113a81d5..000000000
--- a/libre/grub/grub-add-GRUB_COLOR_variables.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 3390ba9..c416489 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -218,6 +218,8 @@ export GRUB_DEFAULT \
-   GRUB_THEME \
-   GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
-+  GRUB_COLOR_NORMAL \
-+  GRUB_COLOR_HIGHLIGHT \
-   GRUB_INIT_TUNE \
-   GRUB_SAVEDEFAULT \
-   GRUB_ENABLE_CRYPTODISK \
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -125,6 +125,14 @@ cat <<EOF
- 
- EOF
- 
-+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
-+    cat << EOF
-+set menu_color_normal=$GRUB_COLOR_NORMAL
-+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
-+
-+EOF
-+fi
-+
- serial=0;
- gfxterm=0;
- for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
deleted file mode 100644
index 56585a47d..000000000
--- a/libre/grub/grub.default
+++ /dev/null
@@ -1,50 +0,0 @@
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Parabola"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-GRUB_CMDLINE_LINUX=""
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
-# modes only.  Entries specified as foreground/background.
-GRUB_COLOR_NORMAL="magenta/black"
-GRUB_COLOR_HIGHLIGHT="white/magenta"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-#GRUB_BACKGROUND="/path/to/wallpaper"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"
-
-#GRUB_SAVEDEFAULT="true"
-
-# Disable advanced submenu
-GRUB_DISABLE_SUBMENU="y"
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
deleted file mode 100644
index 9188b357a..000000000
--- a/libre/grub/grub.install
+++ /dev/null
@@ -1,33 +0,0 @@
-infodir="usr/share/info"
-filelist=('grub.info' 'grub-dev.info')
-
-post_install() {
-  if [ -f /boot/grub/grub.cfg.pacsave ]; then
-    echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
-    install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
-  fi
-
-  cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
-EOM
-  
-  grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
-  echo "done."
-
-  for file in ${filelist[@]}; do
-    install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete ${infodir}/${file} ${infodir}/dir 2> /dev/null
-  done
-}
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
deleted file mode 100644
index 6e3a524f0..000000000
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 016ee82..2cdbdd8 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -214,6 +214,8 @@ export GRUB_DEFAULT \
-   GRUB_THEME \
-   GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
-+  GRUB_COLOR_NORMAL \
-+  GRUB_COLOR_HIGHLIGHT \
-   GRUB_INIT_TUNE \
-   GRUB_SAVEDEFAULT \
-   GRUB_ENABLE_CRYPTODISK \
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -125,6 +125,14 @@ cat <<EOF
- 
- EOF
- 
-+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
-+    cat << EOF
-+set menu_color_normal=$GRUB_COLOR_NORMAL
-+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
-+
-+EOF
-+fi
-+
- serial=0;
- gfxterm=0;
- for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index e27d6f7..a946e71 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,25 @@ CLASS="--class gnu-linux --class gnu --class os"
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS=GNU/Linux
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} Linux and GNU"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU+Linux"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
-+  else
-+      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  fi
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
-@@ -87,6 +105,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
-@@ -100,7 +120,7 @@ linux_entry ()
-   else
-       echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-   fi      
--  if [ x$type != xrecovery ] ; then
-+  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | grub_add_tab
-   fi
- 
-@@ -132,7 +152,8 @@ linux_entry ()
-     fi
-     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-   fi
--  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-+
-+  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
-   sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
- 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +211,22 @@ while [ "x$list" != "x" ] ; do
-   alt_version=`echo $version | sed -e "s,\.old$,,g"`
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-+  if test -e "/etc/parabola-release" ; then
-+    if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then
-+      version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
-+      
-+      if [ "x${version}" = "x" ] ; then
-+        version="libre kernel"
-+      else
-+        version="`echo "${version}" | sed -e 's,-,,g'`"
-+        version="libre ${version} kernel"
-+      fi
-+    fi
-+  fi
-+  
-   initrd=
-+  initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
-+
-   for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
- 	   "initrd-${version}" "initramfs-${version}.img" \
- 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +234,8 @@ while [ "x$list" != "x" ] ; do
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
--	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-+	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
-+	   "${initrd_arch}.img" ; do
-     if test -e "${dirname}/${i}" ; then
-       initrd="$i"
-       break
-@@ -226,6 +263,22 @@ while [ "x$list" != "x" ] ; do
-     linux_root_device_thisversion=${GRUB_DEVICE}
-   fi
- 
-+  if test -e "/etc/parabola-release" ; then
-+    is_first_entry="false"
-+    
-+    linux_entry "${OS}" "${version}" true \
-+              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+    
-+    for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do
-+      if test -e "${dirname}/${i}" ; then
-+        initrd="${i}"
-+        linux_entry "${OS}" "${version}" fallback \
-+                    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+        break
-+      fi
-+    done
-+  fi
-+
-   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -240,8 +293,11 @@ while [ "x$list" != "x" ] ; do
-     is_top_level=false
-   fi
- 
-+  if ! test -e "/etc/parabola-release" ; then
-   linux_entry "${OS}" "${version}" advanced \
-               "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+  fi
-+
-   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
-     linux_entry "${OS}" "${version}" recovery \
-                 "single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +308,10 @@ done
- 
- # If at least one kernel was found, then we need to
- # add a closing '}' for the submenu command.
-+if ! test -e "/etc/parabola-release" ; then
- if [ x"$is_top_level" != xtrue ]; then
-   echo '}'
- fi
-+fi
- 
- echo "$title_correction_code"