Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refind: account for btrfs setups when generating manual stanzas #48906

Closed
wants to merge 1 commit into from
Closed

refind: account for btrfs setups when generating manual stanzas #48906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions srcpkgs/refind/files/kernel.post-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@ touch "$REFIND_CONF"

tmpfile=$(mktemp /tmp/refind.XXXXXXX)

: ${REFIND_LABEL:="Void Linux"}
: ${REFIND_BOOT_PREFIX:=""}

zversion=$(echo "$VERSION" | sed 's/[.]/[.]/g')

zentry=$(cat <<EOF
menuentry "Void Linux $VERSION" {
volume "Void Linux"
loader /vmlinuz-$VERSION
initrd /initramfs-$VERSION.img
options "$OPTIONS"
volume "$REFIND_LABEL"
loader "$REFIND_BOOT_PREFIX/vmlinuz-$VERSION"
initrd "$REFIND_BOOT_PREFIX/initramfs-$VERSION.img"
options "$OPTIONS"
}
EOF
)
Expand Down
8 changes: 7 additions & 1 deletion srcpkgs/refind/files/refind-kernel-hook.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@ UPDATE_REFIND_CONF=0
# /efi/EFI/BOOT/refind.conf
REFIND_CONF=/boot/EFI/refind/refind.conf

# addition kernel cmdline
# Set a custom label for Void boot entries
#REFIND_LABEL="Void Linux"

# Prefix prepended to kernel and initramfs paths in Void boot entries
#REFIND_BOOT_PREFIX=""

# Additional kernel cmdline parameters
OPTIONS="quiet loglevel=4"
15 changes: 14 additions & 1 deletion srcpkgs/refind/patches/add-cross-compile-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/Make.common
+++ b/Make.common
@@ -40,21 +40,13 @@ REFIND_SBAT_CSV = refind-sbat.csv
@@ -40,21 +40,13 @@
# Note: TIANOBASE is defined in master Makefile and exported
GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw
prefix = /usr/bin/
Expand Down Expand Up @@ -29,3 +29,16 @@

ifeq ($(MAKEWITH),TIANO)
# Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47)
@@ -148,8 +140,10 @@

ifeq ($(ARCH), aarch64)
GNUEFI_CFLAGS += -DEFIAARCH64
- FORMAT = -O binary
- FORMAT_DRIVER = -O binary
+ ifneq ($(OBJCOPY_LT_2_38),)
+ FORMAT = -O binary
+ FORMAT_DRIVER = -O binary
+ endif
SUBSYSTEM_LDFLAG = -defsym=EFI_SUBSYSTEM=0xa
LDFLAGS += --warn-common --no-undefined --fatal-warnings

3 changes: 1 addition & 2 deletions srcpkgs/refind/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'refind'
pkgname=refind
version=0.14.0.2
revision=2
revision=3
archs="x86_64* i686* aarch64*"
makedepends="gnu-efi-libs"
depends="bash dosfstools efibootmgr"
Expand Down Expand Up @@ -73,7 +73,6 @@ do_install() {
vinstall gptsync/gptsync_${_EFI_ARCH}.efi 644 \
usr/share/refind/tools_${_EFI_ARCH}/


vinstall "${FILESDIR}/refind-kernel-hook.conf" 644 etc/default
vinstall ${FILESDIR}/kernel.post-install 744 \
etc/kernel.d/post-install 50-refind
Expand Down