randomxusr I found the Argon2 implementation patches from the grub-devel but I also had to write my own patch to make grub-install work with luks2
Search Criteria
Package Details: grub-improved-luks2-git 2.12.r10.g04d2a50f3-1
Package Actions
Git Clone URL: | https://aur.archlinux.org/grub-improved-luks2-git.git (read-only, click to copy) |
---|---|
Package Base: | grub-improved-luks2-git |
Description: | GNU GRand Unified Bootloader (2) with Argon2 support. Patch made by Patrick Steinhardt |
Upstream URL: | https://www.gnu.org/software/grub/ |
Licenses: | GPL3, CC0 |
Conflicts: | grub |
Provides: | grub |
Submitter: | Ax333l |
Maintainer: | Ax333l |
Last Packager: | Ax333l |
Votes: | 27 |
Popularity: | 1.82 |
First Submitted: | 2022-01-02 14:06 (UTC) |
Last Updated: | 2024-03-09 00:19 (UTC) |
Dependencies (18)
- device-mapper (device-mapper-gitAUR)
- freetype2 (freetype2-qdoledAUR, freetype2-macosAUR, freetype2-gitAUR)
- fuse2
- gettext (gettext-gitAUR)
- autogen (make)
- bdf-unifontAUR (make)
- bison (byacc-bisonAUR, bison-gitAUR) (make)
- git (git-gitAUR, git-glAUR) (make)
- help2man (help2man-gitAUR, python-help2manAUR) (make)
- python (python37AUR, python311AUR, python310AUR) (make)
- rsync (rsync-gitAUR, rsync-reflinkAUR, rsync-reflink-gitAUR) (make)
- texinfo (texinfo-gitAUR) (make)
- ttf-dejavu (ttf-dejavu-ibAUR, ttf-dejavu-emojilessAUR) (make)
- dosfstools (dosfstools-gitAUR) (optional) – For grub-mkrescue FAT FS and EFI support
- efibootmgr (efibootmgr-gitAUR) (optional) – For grub-install EFI support
- libisoburn (libisoburn-gitAUR) (optional) – Provides xorriso for generating grub rescue iso using grub-mkrescue
- mtools (mtools-svnAUR) (optional) – For grub-mkrescue FAT FS support
- os-prober (os-prober-gitAUR, os-prober-btrfsAUR) (optional) – To detect other OSes when generating grub.cfg in BIOS systems
Required by (314)
- apple_set_os (requires grub) (optional)
- arch-grub2-theme (requires grub)
- arch-matrix-grub-theme-git (requires grub)
- archiso-git (requires grub) (optional)
- archiso-grub-themes (requires grub)
- archuseriso (requires grub)
- bieaz (requires grub)
- bieaz-git (requires grub)
- boo-grub-git (requires grub)
- booty-git (requires grub)
- cryptboot (requires grub)
- cyberpunk-grub-theme-git (requires grub)
- dedsec-grub2-theme (requires grub)
- diabos-base (requires grub)
- distro-grub-themes-arch (requires grub)
- distro-grub-themes-endeavouros (requires grub)
- distro-grub-themes-meta (requires grub)
- dracula-grub-theme-git (requires grub)
- endeavouros-galleon-grub (requires grub)
- graphite-grub-theme-default-1080p (requires grub)
- Show 294 more...
Sources (12)
Ax333l commented on 2022-09-02 05:23 (UTC)
randomxusr commented on 2022-07-31 21:29 (UTC)
Curious.
Have you added your own changes to grub in order to make this work?
Or is this simply the latest git build just working with Luks2 and Argon2?
Ax333l commented on 2022-07-29 10:26 (UTC) (edited on 2022-07-29 10:27 (UTC) by Ax333l)
I am not sure how I managed to mess up the source list but I have updated grub to the latest version.
Try deleting the grub-improved-luks2-git folder in your yay/paru cache directory if you still can't build it.
Porous3247 commented on 2022-07-27 16:17 (UTC)
Here's a patch to make the grub upstream version the same as what the official grub
package has at the moment. I successfully built it.
diff --git a/PKGBUILD b/PKGBUILD
index 404e98e..5c2510d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _build_platforms="x86_64-efi"
_pkgname="grub"
pkgname="${_pkgname}-improved-luks2-git"
-pkgver=2.06.r110.gbe257de00
+pkgver=2.06.r261.g2f4430cc0
pkgrel=1
pkgdesc="GNU GRand Unified Bootloader (2) with Argon2 and better LUKS2 support"
arch=('x86_64')
@@ -41,12 +41,11 @@ conflicts=("${_pkgname}")
backup=('etc/default/grub'
'etc/grub.d/40_custom')
install="${pkgname}.install"
-source=("grub::git+https://git.savannah.gnu.org/git/grub.git#commit=be257de00c"
+source=("grub::git+https://git.savannah.gnu.org/git/grub.git#commit=2f4430cc0a"
"grub-extras::git+https://git.savannah.gnu.org/git/grub-extras.git"
"gnulib::git+https://git.savannah.gnu.org/git/gnulib.git"
'argon_1.patch'
'argon_2.patch'
- 'argon_2.patch'
'argon_3.patch'
'argon_4.patch'
'argon_5.patch'
@@ -75,7 +74,6 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
'5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
'580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5'
'791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
prokoprandacek commented on 2022-07-27 10:08 (UTC)
Hi!
The update 2.06.r110.gbe257de00-1 -> 2.06.r284.g1b3d97bdf-1
seems to be no longer able to build.
...
if test x0 = x1; then strip -S -x -o kernel.img.bin kernel.exec; -felf64 -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd kernel.img.bin kernel.img; rm -f kernel.img.bin; elif test ! -z ''; then strip -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx --strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -o kernel.img.bin kernel.exec && kernel.img.bin kernel.img || (rm -f kernel.img; rm -f kernel.img.bin; exit 1); rm -f kernel.img.bin; else strip -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx --strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -o kernel.img kernel.exec; fi
nm: all_video.module: no symbols
nm: all_video.module: no symbols
mv syminfo.lst.new syminfo.lst
cat syminfo.lst | sort | gawk -f ../../grub-core/genmoddep.awk > moddep.lst || (rm -f moddep.lst; exit 1)
TARGET_OBJ2ELF= sh genmod.sh moddep.lst disk.module build-grub-module-verifier disk.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst trig.module build-grub-module-verifier trig.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst cs5536.module build-grub-module-verifier cs5536.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst usb.module build-grub-module-verifier usb.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst usbserial_common.module build-grub-module-verifier usbserial_common.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst usbserial_pl2303.module build-grub-module-verifier usbserial_pl2303.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst usbserial_ftdi.module build-grub-module-verifier usbserial_ftdi.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst usbserial_usbdebug.module build-grub-module-verifier usbserial_usbdebug.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst uhci.module build-grub-module-verifier uhci.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst ohci.module build-grub-module-verifier ohci.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst ehci.module build-grub-module-verifier ehci.mod
TARGET_OBJ2ELF= sh genmod.sh moddep.lst nativedisk.module build-grub-module-verifier nativedisk.mod
build-grub-module-verifier: error: usbserial_pl2303.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: usbserial_pl2303.mod] Error 1
make[3]: *** Waiting for unfinished jobs....
build-grub-module-verifier: error: nativedisk.mod.tmp: incompatible license.
build-grub-module-verifier: error: disk.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: nativedisk.mod] Error 1
make[3]: *** [Makefile:50038: disk.mod] Error 1
build-grub-module-verifier: error: usbserial_common.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: usbserial_common.mod] Error 1
build-grub-module-verifier: error: trig.mod.tmp: incompatible license.
build-grub-module-verifier: error: usbserial_ftdi.mod.tmp: incompatible licensemake[3]: *** [Makefile:50038: trig.mod] Error 1
.
make[3]: *** [Makefile:50038: usbserial_ftdi.mod] Error 1
build-grub-module-verifier: error: ehci.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: ehci.mod] Error 1
build-grub-module-verifier: error: build-grub-module-verifier: error:uhci.mod.tmp: incompatible license .
usb.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: uhci.mod] Error 1
make[3]: *** [Makefile:50038: usb.mod] Error 1
build-grub-module-verifier: error: usbserial_usbdebug.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: usbserial_usbdebug.mod] Error 1
build-grub-module-verifier: error: ohci.mod.tmp: incompatible license.
build-grub-module-verifier: error: cs5536.mod.tmp: incompatible license.
make[3]: *** [Makefile:50038: ohci.mod] Error 1
make[3]: *** [Makefile:50038: cs5536.mod] Error 1
make[3]: Leaving directory '/home/prokop/.cache/yay/grub-improved-luks2-git/src/grub/build_x86_64-efi/grub-core'
make[2]: *** [Makefile:27801: all] Error 2
make[2]: Leaving directory '/home/prokop/.cache/yay/grub-improved-luks2-git/src/grub/build_x86_64-efi/grub-core'
make[1]: *** [Makefile:12180: all-recursive] Error 1
make[1]: Leaving directory '/home/prokop/.cache/yay/grub-improved-luks2-git/src/grub/build_x86_64-efi'
make: *** [Makefile:3946: all] Error 2
==> ERROR: A failure occurred in build().
Aborting...
-> error making: grub-improved-luks2-git
codeagain commented on 2022-06-26 06:42 (UTC)
Hello!
It seems like this package's last update is prior to the latest security patchset from Jun 7: https://lists.gnu.org/archive/html/grub-devel/2022-06/msg00035.html
The arch official grub package is now using grub's master: https://github.com/archlinux/svntogit-packages/commit/ca6954b79e3a4058c749a3d5fbcad07d1967d93d
Ax333l commented on 2022-03-22 18:35 (UTC) (edited on 2022-03-27 07:30 (UTC) by Ax333l)
The package should work again now.
<deleted-account> commented on 2022-03-20 02:00 (UTC)
It doesn't even start building now.
==> Starting prepare()...
patching file util/grub-mkconfig.in
Hunk #1 succeeded at 247 (offset 1 line).
patching file util/grub.d/00_header.in
patching file util/grub.d/10_linux.in
Hunk #1 succeeded at 97 (offset 4 lines).
Hunk #2 succeeded at 204 (offset 4 lines).
Hunk #3 succeeded at 291 with fuzz 1 (offset 4 lines).
patching file grub-core/kern/dl.c
Hunk #1 succeeded at 811 (offset 8 lines).
patching file grub-core/kern/mm.c
Hunk #1 succeeded at 395 (offset 35 lines).
patching file include/grub/dl.h
patching file grub-core/kern/mm.c
Hunk #2 succeeded at 396 (offset 35 lines).
patching file include/grub/mm.h
patching file grub-core/kern/efi/mm.c
patching file grub-core/kern/efi/mm.c
Reversed (or previously applied) patch detected! Skipping patch.
6 out of 6 hunks ignored -- saving rejects to file grub-core/kern/efi/mm.c.rej
==> ERROR: A failure occurred in prepare().
Aborting...
-> error making: grub-improved-luks2-git
Pinned Comments
Ax333l commented on 2022-02-17 18:58 (UTC) (edited on 2023-06-16 14:24 (UTC) by Ax333l)
I have disabled translations because they have been the cause of build failures in both this package and
grub-git
. If you want to re-enable them, check the PKGBUILD.Also, make sure you have installed
base-devel
.Argon2 might not work on some devices due to issues with the memory allocator