diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 64 |
1 files changed, 20 insertions, 44 deletions
@@ -9,22 +9,21 @@ _IA32_EFI_IN_ARCH_X64="1" ## "1" to enable EMU build, "0" to disable _GRUB_EMU_BUILD="0" -_GRUB_EXTRAS_COMMIT="8a245d5c1800627af4cefa99162a89c7a46d8842" -_GNULIB_COMMIT="be584c56eb1311606e5ea1a36363b97bddb6eed3" -_UNIFONT_VER="13.0.06" +[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386' -[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" - -[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" +[[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386' pkgname='grub-libzfs' pkgdesc='GNU GRand Unified Bootloader (2) - libzfs support' epoch=2 -_pkgver=2.04 +_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver} +_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3' +_unifont_ver='13.0.06' +_pkgver=2.06 pkgver=${_pkgver/-/} -pkgrel=10 +pkgrel=1 url='https://www.gnu.org/software/grub/' arch=('x86_64') license=('GPL3') @@ -58,33 +57,22 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl> '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com> -source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed" - "git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}" - "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}" - "http://unifoundry.com/pub/unifont/unifont-${_UNIFONT_VER}/font-builds/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig} - '0003-10_linux-detect-archlinux-initramfs.patch' - '0004-add-GRUB_COLOR_variables.patch' - '0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch' - '0006-BootHole.patch' +source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" + "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}" + "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} + '0001-00_header-add-GRUB_COLOR_-variables.patch' + '0002-10_linux-detect-archlinux-initramfs.patch' 'grub.default') sha256sums=('SKIP' 'SKIP' - 'SKIP' 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' 'SKIP' - '171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4' - 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' - '06820004912a3db195a76e68b376fce1ba6507ac740129f0b99257ef07aba1ea' - '55c559b6d8c4a832a43cc35c7635de37402ec9e3e3bfd8b2b7761a06f0bfda02' + '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' + '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d' '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206') _backports=( - # grub-mkconfig: Use portable "command -v" to detect installed programs - '28a7e597de0d5584f65e36f9588ff9041936e617' - - # build: Fix GRUB i386-pc build with Ubuntu gcc - '6643507ce30f775008e093580f0c9499dfb2c485' ) _configure_options=( @@ -121,18 +109,12 @@ prepare() { git cherry-pick -n "${_c}" done - echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." - patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch" - echo "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}/0004-add-GRUB_COLOR_variables.patch" - - echo "Patch to NLS installation..." - patch -Np1 -i "${srcdir}/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch" + patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" - echo "Patch BootHole..." - patch -Np1 -i "${srcdir}/0006-BootHole.patch" + echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." + patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch" echo "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 "configure.ac" @@ -148,7 +130,7 @@ prepare() { echo "Avoid problem with unifont during compile of grub..." # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 - gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf" + gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf" echo "Run bootstrap..." ./bootstrap \ @@ -171,12 +153,6 @@ _build_grub-common_and_bios() { cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/" cd "${srcdir}/grub-bios/" - echo "Add the grub-extra sources for bios build..." - install -d "${srcdir}/grub-bios/grub-extras" - cp -r "${srcdir}/grub-extras/915resolution" \ - "${srcdir}/grub-bios/grub-extras/915resolution" - export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/" - echo "Unset all compiler FLAGS for bios build..." unset CFLAGS unset CPPFLAGS |