diff --git a/core/grub/.SRCINFO b/core/grub/.SRCINFO index cece78690..543cec3a9 100644 --- a/core/grub/.SRCINFO +++ b/core/grub/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = grub pkgdesc = GNU GRand Unified Bootloader (2) pkgver = 2.12 - pkgrel = 1 + pkgrel = 2 epoch = 2 url = https://www.gnu.org/software/grub/ install = grub.install @@ -47,10 +47,10 @@ pkgbase = grub options = !makeflags backup = etc/default/grub backup = etc/grub.d/40_custom - source = git+https://git.savannah.gnu.org/git/grub.git#tag=03e6ea18f6f834f177cad017279bedbb0a3de594?signed + source = git+https://git.savannah.gnu.org/git/grub.git#tag=grub-2.12?signed source = git+https://git.savannah.gnu.org/git/gnulib.git - source = https://ftp.gnu.org/gnu/unifont/unifont-15.1.04/unifont-15.1.04.bdf.gz - source = https://ftp.gnu.org/gnu/unifont/unifont-15.1.04/unifont-15.1.04.bdf.gz.sig + source = https://ftp.gnu.org/gnu/unifont/unifont-15.1.05/unifont-15.1.05.bdf.gz + source = https://ftp.gnu.org/gnu/unifont/unifont-15.1.05/unifont-15.1.05.bdf.gz.sig source = 0001-00_header-add-GRUB_COLOR_-variables.patch source = 0002-10_linux-detect-archlinux-initramfs.patch source = 0003-support-dropins-for-default-configuration.patch @@ -61,7 +61,7 @@ pkgbase = grub validpgpkeys = 95D2E9AB8740D8046387FD151A09227B1F435A33 sha256sums = SKIP sha256sums = SKIP - sha256sums = 88e00954b10528407e62e97ce6eaa88c847ebfd9a464cafde6bf55c7e4eeed54 + sha256sums = 8ea5b5a14d71e3353d1fea373f5d88d198ad1e285cedd8294655926ee11fd91d sha256sums = SKIP sha256sums = 5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab sha256sums = 8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d diff --git a/core/grub/PKGBUILD b/core/grub/PKGBUILD index f361b2320..92f32143e 100644 --- a/core/grub/PKGBUILD +++ b/core/grub/PKGBUILD @@ -29,11 +29,10 @@ _GRUB_EMU_BUILD="0" pkgname='grub' pkgdesc='GNU GRand Unified Bootloader (2)' epoch=2 -_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver} _pkgver=2.12 -_unifont_ver='15.1.04' +_unifont_ver='15.1.05' pkgver=${_pkgver/-/} -pkgrel=1 +pkgrel=2 url='https://www.gnu.org/software/grub/' arch=('x86_64') license=('GPL-3.0-or-later') @@ -68,7 +67,7 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy -source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" +source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed" 'git+https://git.savannah.gnu.org/git/gnulib.git' "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} '0001-00_header-add-GRUB_COLOR_-variables.patch' @@ -80,7 +79,7 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" sha256sums=('SKIP' 'SKIP' - '88e00954b10528407e62e97ce6eaa88c847ebfd9a464cafde6bf55c7e4eeed54' + '8ea5b5a14d71e3353d1fea373f5d88d198ad1e285cedd8294655926ee11fd91d' 'SKIP' '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'