diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-05-12 20:12:27 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-05-12 20:12:27 -0300 |
| commit | b22b406dde205fe7821711fe18f0dd12d26d78cf (patch) | |
| tree | 411066a1b26caa356be66b7f283ff79a84039c72 | |
| parent | 8d0f4ac4cbf56fc5c5cadb5ba09c35e3674a886b (diff) | |
| download | abslibre-b22b406dde205fe7821711fe18f0dd12d26d78cf.tar.gz abslibre-b22b406dde205fe7821711fe18f0dd12d26d78cf.tar.bz2 abslibre-b22b406dde205fe7821711fe18f0dd12d26d78cf.zip | |
grub-1:2.02.beta2-3.1: revert changes, disable advanced submenu
| -rw-r--r-- | libre/grub/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/grub/grub.default | 3 |
2 files changed, 10 insertions, 8 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index b7b7b80bd..c7960f88c 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=3 +pkgrel=3.1 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') @@ -43,8 +43,8 @@ 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' 'grub-10_linux-rebrand-free-distros.patch') @@ -53,10 +53,10 @@ md5sums=('SKIP' 'SKIP' '728b7439ac733a7c0d56049adec364c7' 'SKIP' - '945527e0de8d384166a4cf23439ae9ee' 'e506ae4a9f9f7d1b765febfa84e10d48' + '9f67330f2979a153acb32af706e0c094' 'be55eabc102f2c60b38ed35c203686d6' - '52d374e0194e3f2e39ff7c92ecd58a6c' + '8d1dd54ae4a1b550c097e056892ce953' 'b23a144b7001c88734b79ed3bec491c4') _pkgver() { @@ -68,10 +68,6 @@ 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" @@ -241,6 +237,9 @@ _package_grub-common_and_bios() { 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 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.default b/libre/grub/grub.default index 8455b67dd..56585a47d 100644 --- a/libre/grub/grub.default +++ b/libre/grub/grub.default @@ -45,3 +45,6 @@ GRUB_COLOR_HIGHLIGHT="white/magenta" #GRUB_INIT_TUNE="480 440 1" #GRUB_SAVEDEFAULT="true" + +# Disable advanced submenu +GRUB_DISABLE_SUBMENU="y" |