[PR PATCH] grub-btrfs: patch for modular configs

[PR PATCH] grub-btrfs: patch for modular configs

[teldra]

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

There is a new pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages fix-grub-btrfs
https://github.com/void-linux/void-packages/pull/30195

grub-btrfs: patch for modular configs
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-GLIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/30195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-grub-btrfs-30195.patch --]
[-- Type: text/x-diff, Size: 1458 bytes --]

From 2b4402e7de348ae4e30f1bf780dd773a76b43848 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 13 Apr 2021 03:36:18 +0200
Subject: [PATCH] grub-btrfs: patch for modular configs

---
 srcpkgs/grub-btrfs/patches/config.patch | 13 +++++++++++++
 srcpkgs/grub-btrfs/template             |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub-btrfs/patches/config.patch

diff --git a/srcpkgs/grub-btrfs/patches/config.patch b/srcpkgs/grub-btrfs/patches/config.patch
new file mode 100644
index 000000000000..61fb9906ccfc
--- /dev/null
+++ b/srcpkgs/grub-btrfs/patches/config.patch
@@ -0,0 +1,13 @@
+--- config.orig	2021-04-13 03:37:11.581669409 +0200
++++ config	2021-04-13 03:38:23.549598497 +0200
+@@ -120,3 +120,10 @@
+ # doesn't work if GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS isn't empty
+ # Default: "false"
+ #GRUB_BTRFS_DISABLE_PROTECTION_SUBMENU="true"
++
++if [ -d /etc/default/grub-btrfs/conf.d ]; then
++	for cfg in $(find /etc/default/grub-btrfs/conf.d -type f -name "*.conf"); do
++		. "${cfg}"
++	done
++fi
++
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 8c1a2f5954c9..ae7dd5973640 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,7 +1,7 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
 version=4.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="grub bash"
 short_desc="Include btrfs snapshots at Grub menu"

Re: [PR PATCH] [Updated] grub-btrfs: patch for modular configs

[teldra]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages fix-grub-btrfs
https://github.com/void-linux/void-packages/pull/30195

grub-btrfs: patch for modular configs
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-GLIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/30195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-grub-btrfs-30195.patch --]
[-- Type: text/x-diff, Size: 12943 bytes --]

From 05cc97c426e2676910cb11cbab92ed23950e7829 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 13 Apr 2021 03:36:18 +0200
Subject: [PATCH] grub-btrfs: update to 4.9; patch for modular configs

---
 srcpkgs/grub-btrfs/patches/config.patch | 280 ++++++++++++++++++++++++
 srcpkgs/grub-btrfs/template             |   2 +-
 2 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub-btrfs/patches/config.patch

diff --git a/srcpkgs/grub-btrfs/patches/config.patch b/srcpkgs/grub-btrfs/patches/config.patch
new file mode 100644
index 000000000000..352c59e79ed1
--- /dev/null
+++ b/srcpkgs/grub-btrfs/patches/config.patch
@@ -0,0 +1,280 @@
+diff --git Makefile Makefile
+index 6ffe8c1..3dfe19f 100644
+--- Makefile
++++ Makefile
+@@ -14,7 +14,7 @@ install:
+ 		exit 1; \
+ 	fi
+ 	@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
+-	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
++	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/conf.d" conf.d/grub-btrfs.cfg
+ 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
+ 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.path
+ 	@install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
+@@ -33,7 +33,7 @@ uninstall:
+ 	fi
+ 	@grub_dirname="$$(grep -oP '^[[:space:]]*GRUB_BTRFS_GRUB_DIRNAME=\K.*' "$(DESTDIR)/etc/default/grub-btrfs/config" | sed "s|\s*#.*||;s|(\s*\(.\+\)\s*)|\1|;s|['\"]||g")"; \
+ 	 rm -f "$${grub_dirname:-/boot/grub}/grub-btrfs.cfg"
+-	@rm -f "$(DESTDIR)/etc/default/grub-btrfs/config"
++	@rm -f "$(DESTDIR)/etc/default/grub-btrfs/conf.d/grub-btrfs.cfg"
+ 	@rm -f "$(DESTDIR)/etc/grub.d/41_snapshots-btrfs"
+ 	@rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.service"
+ 	@rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.path"
+diff --git conf.d/grub-btrfs.cfg conf.d/grub-btrfs.cfg
+new file mode 100644
+index 0000000..4638b10
+--- /dev/null
++++ conf.d/grub-btrfs.cfg
+@@ -0,0 +1,122 @@
++#!/usr/bin/env bash
++
++# Disable grub-btrfs.
++# Default: "false"
++#GRUB_BTRFS_DISABLE="true"
++
++# Name appearing in the Grub menu.
++# Default: "Use distribution information from /etc/os-release."
++#GRUB_BTRFS_SUBMENUNAME="Arch Linux snapshots"
++
++# Add a name ahead your snapshots entries in the Grub menu.
++# Default: "Snapshot:"
++#GRUB_BTRFS_PREFIXENTRY="Snapshot:"
++
++# Show full path snapshot or only name in the Grub menu, weird reaction with snapper.
++# Default: "true"
++#GRUB_BTRFS_DISPLAY_PATH_SNAPSHOT="false"
++
++# Custom title.
++# shows/hides p"prefix" d"date" n"name" in the Grub menu, separator "/", custom order available.
++# Default: "p/d/n"
++#GRUB_BTRFS_TITLE_FORMAT="p/d/n"
++
++# Limit the number of snapshots populated in the GRUB menu.
++# Default: "50"
++#GRUB_BTRFS_LIMIT="50"
++
++# Sort the found subvolumes by "ogeneration" or "generation" or "path" or "rootid".
++# # See Sorting section to https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs-subvolume#SUBCOMMAND
++# "-rootid" means list snapshot by new ones first.
++# Default: "-rootid"
++#GRUB_BTRFS_SUBVOLUME_SORT="+ogen,-gen,path,rootid"
++
++# Show snapshots found during run "grub-mkconfig"
++# Default: "true"
++#GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND="false"
++
++# Show Total of snapshots found during run "grub-mkconfig"
++# Default: "true"
++#GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND="true"
++
++# By default, "grub-btrfs" automatically detects most existing kernels.
++# If you have one or more custom kernels, you can add them here.
++# Default: ("")
++#GRUB_BTRFS_NKERNEL=("kernel-custom" "vmlinux-custom")
++
++# By default, "grub-btrfs" automatically detects most existing initramfs.
++# If you have one or more custom initramfs, you can add them here.
++# Default: ("")
++#GRUB_BTRFS_NINIT=("initramfs-custom.img" "initrd-custom.img" "otherinit-custom.gz")
++
++# By default, "grub-btrfs" automatically detects most existing microcodes.
++# If you have one or more custom microcodes, you can add them here.
++# Default: ("")
++#GRUB_BTRFS_CUSTOM_MICROCODE=("custom-ucode.img" "custom-uc.img "custom_ucode.cpio")
++
++# Comma seperated mount options to be used when booting a snapshot.
++# They can be defined here as well as in the "/" line inside the respective snapshots'
++# "/etc/fstab" files.  Mount options found in both places are combined, and this variable
++# takes priority over `fstab` entries.
++# NB: Do NOT include "subvol=..." or "subvolid=..." here.
++# Default: ""
++#GRUB_BTRFS_ROOTFLAGS="space_cache,commit=10,norecovery"
++
++# Ignore specific path during run "grub-mkconfig".
++# Only exact paths are ignored.
++# e.g : if `specific path` = @, only `@` snapshot will be ignored.
++# Default: ("@")
++GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("@")
++
++# Ignore prefix path during run "grub-mkconfig".
++# Any path starting with the specified string will be ignored.
++# e.g : if `prefix path` = @, all snapshots beginning with "@/..." will be ignored.
++# Default: ("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
++GRUB_BTRFS_IGNORE_PREFIX_PATH=("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
++
++# By default "grub-btrfs" automatically detects your boot partition,
++# either located at the system root or on a separate partition,
++# but cannot detect if it is in a subvolume.
++# Change to "true" if you have a boot partition in a different subvolume.
++# Default: "false"
++#GRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION="true"
++
++# Location of the folder containing the "grub.cfg" file.
++# Use by grub-btrfs to save the file "grub-btrfs.cfg".
++# Might be grub2 on some systems.
++# For example, on Fedora with EFI : "/boot/efi/EFI/fedora"
++# Default: "/boot/grub"
++#GRUB_BTRFS_GRUB_DIRNAME="/boot/grub2"
++
++# Location of kernels/initramfs/microcode.
++# Use by "grub-btrfs" to detect the boot partition and the location of kernels/initrafms/microcodes.
++# Default: "/boot"
++#GRUB_BTRFS_BOOT_DIRNAME="/boot"
++
++# Name/path of grub-mkconfig command, use by "grub-btrfs.service"
++# Might be 'grub2-mkconfig' on some systems (Fedora ...)
++# Default paths are /sbin:/bin:/usr/sbin:/usr/bin,
++# if your path is missing, report it on the upstream project.
++# For example, on Fedora : "/sbin/grub2-mkconfig"
++# You can use only name or full path.
++# Default: grub-mkconfig
++#GRUB_BTRFS_MKCONFIG=/usr/bin/grub2-mkconfig
++
++# Snapper
++# Snapper's config name to use
++# Default: "root"
++#GRUB_BTRFS_SNAPPER_CONFIG="root"
++
++# Password protection management for submenu,snapshots
++# Refer to the Grub documentation https://www.gnu.org/software/grub/manual/grub/grub.html#Authentication-and-authorisation
++# and this comment https://github.com/Antynea/grub-btrfs/issues/95#issuecomment-682295660
++#
++# Add authorized usernames separate by comma (foo,bar)
++# When Grub's password protection is enabled, the superuser is authorized by default, it isn't necessary to add it
++# Default: ""
++#GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS="foo,bar"
++#
++# Disable authentication support for submenu of Grub-btrfs only (--unrestricted)
++# doesn't work if GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS isn't empty
++# Default: "false"
++#GRUB_BTRFS_DISABLE_PROTECTION_SUBMENU="true"
+diff --git config config
+index 4638b10..5ef3a84 100644
+--- config
++++ config
+@@ -1,122 +1,4 @@
+ #!/usr/bin/env bash
+-
+-# Disable grub-btrfs.
+-# Default: "false"
+-#GRUB_BTRFS_DISABLE="true"
+-
+-# Name appearing in the Grub menu.
+-# Default: "Use distribution information from /etc/os-release."
+-#GRUB_BTRFS_SUBMENUNAME="Arch Linux snapshots"
+-
+-# Add a name ahead your snapshots entries in the Grub menu.
+-# Default: "Snapshot:"
+-#GRUB_BTRFS_PREFIXENTRY="Snapshot:"
+-
+-# Show full path snapshot or only name in the Grub menu, weird reaction with snapper.
+-# Default: "true"
+-#GRUB_BTRFS_DISPLAY_PATH_SNAPSHOT="false"
+-
+-# Custom title.
+-# shows/hides p"prefix" d"date" n"name" in the Grub menu, separator "/", custom order available.
+-# Default: "p/d/n"
+-#GRUB_BTRFS_TITLE_FORMAT="p/d/n"
+-
+-# Limit the number of snapshots populated in the GRUB menu.
+-# Default: "50"
+-#GRUB_BTRFS_LIMIT="50"
+-
+-# Sort the found subvolumes by "ogeneration" or "generation" or "path" or "rootid".
+-# # See Sorting section to https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs-subvolume#SUBCOMMAND
+-# "-rootid" means list snapshot by new ones first.
+-# Default: "-rootid"
+-#GRUB_BTRFS_SUBVOLUME_SORT="+ogen,-gen,path,rootid"
+-
+-# Show snapshots found during run "grub-mkconfig"
+-# Default: "true"
+-#GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND="false"
+-
+-# Show Total of snapshots found during run "grub-mkconfig"
+-# Default: "true"
+-#GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND="true"
+-
+-# By default, "grub-btrfs" automatically detects most existing kernels.
+-# If you have one or more custom kernels, you can add them here.
+-# Default: ("")
+-#GRUB_BTRFS_NKERNEL=("kernel-custom" "vmlinux-custom")
+-
+-# By default, "grub-btrfs" automatically detects most existing initramfs.
+-# If you have one or more custom initramfs, you can add them here.
+-# Default: ("")
+-#GRUB_BTRFS_NINIT=("initramfs-custom.img" "initrd-custom.img" "otherinit-custom.gz")
+-
+-# By default, "grub-btrfs" automatically detects most existing microcodes.
+-# If you have one or more custom microcodes, you can add them here.
+-# Default: ("")
+-#GRUB_BTRFS_CUSTOM_MICROCODE=("custom-ucode.img" "custom-uc.img "custom_ucode.cpio")
+-
+-# Comma seperated mount options to be used when booting a snapshot.
+-# They can be defined here as well as in the "/" line inside the respective snapshots'
+-# "/etc/fstab" files.  Mount options found in both places are combined, and this variable
+-# takes priority over `fstab` entries.
+-# NB: Do NOT include "subvol=..." or "subvolid=..." here.
+-# Default: ""
+-#GRUB_BTRFS_ROOTFLAGS="space_cache,commit=10,norecovery"
+-
+-# Ignore specific path during run "grub-mkconfig".
+-# Only exact paths are ignored.
+-# e.g : if `specific path` = @, only `@` snapshot will be ignored.
+-# Default: ("@")
+-GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("@")
+-
+-# Ignore prefix path during run "grub-mkconfig".
+-# Any path starting with the specified string will be ignored.
+-# e.g : if `prefix path` = @, all snapshots beginning with "@/..." will be ignored.
+-# Default: ("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
+-GRUB_BTRFS_IGNORE_PREFIX_PATH=("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
+-
+-# By default "grub-btrfs" automatically detects your boot partition,
+-# either located at the system root or on a separate partition,
+-# but cannot detect if it is in a subvolume.
+-# Change to "true" if you have a boot partition in a different subvolume.
+-# Default: "false"
+-#GRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION="true"
+-
+-# Location of the folder containing the "grub.cfg" file.
+-# Use by grub-btrfs to save the file "grub-btrfs.cfg".
+-# Might be grub2 on some systems.
+-# For example, on Fedora with EFI : "/boot/efi/EFI/fedora"
+-# Default: "/boot/grub"
+-#GRUB_BTRFS_GRUB_DIRNAME="/boot/grub2"
+-
+-# Location of kernels/initramfs/microcode.
+-# Use by "grub-btrfs" to detect the boot partition and the location of kernels/initrafms/microcodes.
+-# Default: "/boot"
+-#GRUB_BTRFS_BOOT_DIRNAME="/boot"
+-
+-# Name/path of grub-mkconfig command, use by "grub-btrfs.service"
+-# Might be 'grub2-mkconfig' on some systems (Fedora ...)
+-# Default paths are /sbin:/bin:/usr/sbin:/usr/bin,
+-# if your path is missing, report it on the upstream project.
+-# For example, on Fedora : "/sbin/grub2-mkconfig"
+-# You can use only name or full path.
+-# Default: grub-mkconfig
+-#GRUB_BTRFS_MKCONFIG=/usr/bin/grub2-mkconfig
+-
+-# Snapper
+-# Snapper's config name to use
+-# Default: "root"
+-#GRUB_BTRFS_SNAPPER_CONFIG="root"
+-
+-# Password protection management for submenu,snapshots
+-# Refer to the Grub documentation https://www.gnu.org/software/grub/manual/grub/grub.html#Authentication-and-authorisation
+-# and this comment https://github.com/Antynea/grub-btrfs/issues/95#issuecomment-682295660
+-#
+-# Add authorized usernames separate by comma (foo,bar)
+-# When Grub's password protection is enabled, the superuser is authorized by default, it isn't necessary to add it
+-# Default: ""
+-#GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS="foo,bar"
+-#
+-# Disable authentication support for submenu of Grub-btrfs only (--unrestricted)
+-# doesn't work if GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS isn't empty
+-# Default: "false"
+-#GRUB_BTRFS_DISABLE_PROTECTION_SUBMENU="true"
++for cfg in $(find /etc/default/grub-btrfs/conf.d -type f -name "*.cfg"); do
++	source "${cfg}"
++done
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 8c1a2f5954c9..d065ea7d47e4 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.8.1
+version=4.9
 revision=1
 build_style=gnu-makefile
 depends="grub bash"

Re: [PR PATCH] [Updated] grub-btrfs: update to 4.9; patch for modular configs

[teldra]

[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages fix-grub-btrfs
https://github.com/void-linux/void-packages/pull/30195

grub-btrfs: update to 4.9; patch for modular configs
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-GLIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/30195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-grub-btrfs-30195.patch --]
[-- Type: text/x-diff, Size: 13370 bytes --]

From 59d0c9ee6429aa8bcac19fe0b05ddd7b3ed98ad1 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 13 Apr 2021 03:36:18 +0200
Subject: [PATCH] grub-btrfs: update to 4.9; patch for modular configs

---
 srcpkgs/grub-btrfs/patches/config.patch | 280 ++++++++++++++++++++++++
 srcpkgs/grub-btrfs/template             |   4 +-
 2 files changed, 282 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/grub-btrfs/patches/config.patch

diff --git a/srcpkgs/grub-btrfs/patches/config.patch b/srcpkgs/grub-btrfs/patches/config.patch
new file mode 100644
index 000000000000..352c59e79ed1
--- /dev/null
+++ b/srcpkgs/grub-btrfs/patches/config.patch
@@ -0,0 +1,280 @@
+diff --git Makefile Makefile
+index 6ffe8c1..3dfe19f 100644
+--- Makefile
++++ Makefile
+@@ -14,7 +14,7 @@ install:
+ 		exit 1; \
+ 	fi
+ 	@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
+-	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
++	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/conf.d" conf.d/grub-btrfs.cfg
+ 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
+ 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.path
+ 	@install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
+@@ -33,7 +33,7 @@ uninstall:
+ 	fi
+ 	@grub_dirname="$$(grep -oP '^[[:space:]]*GRUB_BTRFS_GRUB_DIRNAME=\K.*' "$(DESTDIR)/etc/default/grub-btrfs/config" | sed "s|\s*#.*||;s|(\s*\(.\+\)\s*)|\1|;s|['\"]||g")"; \
+ 	 rm -f "$${grub_dirname:-/boot/grub}/grub-btrfs.cfg"
+-	@rm -f "$(DESTDIR)/etc/default/grub-btrfs/config"
++	@rm -f "$(DESTDIR)/etc/default/grub-btrfs/conf.d/grub-btrfs.cfg"
+ 	@rm -f "$(DESTDIR)/etc/grub.d/41_snapshots-btrfs"
+ 	@rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.service"
+ 	@rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.path"
+diff --git conf.d/grub-btrfs.cfg conf.d/grub-btrfs.cfg
+new file mode 100644
+index 0000000..4638b10
+--- /dev/null
++++ conf.d/grub-btrfs.cfg
+@@ -0,0 +1,122 @@
++#!/usr/bin/env bash
++
++# Disable grub-btrfs.
++# Default: "false"
++#GRUB_BTRFS_DISABLE="true"
++
++# Name appearing in the Grub menu.
++# Default: "Use distribution information from /etc/os-release."
++#GRUB_BTRFS_SUBMENUNAME="Arch Linux snapshots"
++
++# Add a name ahead your snapshots entries in the Grub menu.
++# Default: "Snapshot:"
++#GRUB_BTRFS_PREFIXENTRY="Snapshot:"
++
++# Show full path snapshot or only name in the Grub menu, weird reaction with snapper.
++# Default: "true"
++#GRUB_BTRFS_DISPLAY_PATH_SNAPSHOT="false"
++
++# Custom title.
++# shows/hides p"prefix" d"date" n"name" in the Grub menu, separator "/", custom order available.
++# Default: "p/d/n"
++#GRUB_BTRFS_TITLE_FORMAT="p/d/n"
++
++# Limit the number of snapshots populated in the GRUB menu.
++# Default: "50"
++#GRUB_BTRFS_LIMIT="50"
++
++# Sort the found subvolumes by "ogeneration" or "generation" or "path" or "rootid".
++# # See Sorting section to https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs-subvolume#SUBCOMMAND
++# "-rootid" means list snapshot by new ones first.
++# Default: "-rootid"
++#GRUB_BTRFS_SUBVOLUME_SORT="+ogen,-gen,path,rootid"
++
++# Show snapshots found during run "grub-mkconfig"
++# Default: "true"
++#GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND="false"
++
++# Show Total of snapshots found during run "grub-mkconfig"
++# Default: "true"
++#GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND="true"
++
++# By default, "grub-btrfs" automatically detects most existing kernels.
++# If you have one or more custom kernels, you can add them here.
++# Default: ("")
++#GRUB_BTRFS_NKERNEL=("kernel-custom" "vmlinux-custom")
++
++# By default, "grub-btrfs" automatically detects most existing initramfs.
++# If you have one or more custom initramfs, you can add them here.
++# Default: ("")
++#GRUB_BTRFS_NINIT=("initramfs-custom.img" "initrd-custom.img" "otherinit-custom.gz")
++
++# By default, "grub-btrfs" automatically detects most existing microcodes.
++# If you have one or more custom microcodes, you can add them here.
++# Default: ("")
++#GRUB_BTRFS_CUSTOM_MICROCODE=("custom-ucode.img" "custom-uc.img "custom_ucode.cpio")
++
++# Comma seperated mount options to be used when booting a snapshot.
++# They can be defined here as well as in the "/" line inside the respective snapshots'
++# "/etc/fstab" files.  Mount options found in both places are combined, and this variable
++# takes priority over `fstab` entries.
++# NB: Do NOT include "subvol=..." or "subvolid=..." here.
++# Default: ""
++#GRUB_BTRFS_ROOTFLAGS="space_cache,commit=10,norecovery"
++
++# Ignore specific path during run "grub-mkconfig".
++# Only exact paths are ignored.
++# e.g : if `specific path` = @, only `@` snapshot will be ignored.
++# Default: ("@")
++GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("@")
++
++# Ignore prefix path during run "grub-mkconfig".
++# Any path starting with the specified string will be ignored.
++# e.g : if `prefix path` = @, all snapshots beginning with "@/..." will be ignored.
++# Default: ("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
++GRUB_BTRFS_IGNORE_PREFIX_PATH=("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
++
++# By default "grub-btrfs" automatically detects your boot partition,
++# either located at the system root or on a separate partition,
++# but cannot detect if it is in a subvolume.
++# Change to "true" if you have a boot partition in a different subvolume.
++# Default: "false"
++#GRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION="true"
++
++# Location of the folder containing the "grub.cfg" file.
++# Use by grub-btrfs to save the file "grub-btrfs.cfg".
++# Might be grub2 on some systems.
++# For example, on Fedora with EFI : "/boot/efi/EFI/fedora"
++# Default: "/boot/grub"
++#GRUB_BTRFS_GRUB_DIRNAME="/boot/grub2"
++
++# Location of kernels/initramfs/microcode.
++# Use by "grub-btrfs" to detect the boot partition and the location of kernels/initrafms/microcodes.
++# Default: "/boot"
++#GRUB_BTRFS_BOOT_DIRNAME="/boot"
++
++# Name/path of grub-mkconfig command, use by "grub-btrfs.service"
++# Might be 'grub2-mkconfig' on some systems (Fedora ...)
++# Default paths are /sbin:/bin:/usr/sbin:/usr/bin,
++# if your path is missing, report it on the upstream project.
++# For example, on Fedora : "/sbin/grub2-mkconfig"
++# You can use only name or full path.
++# Default: grub-mkconfig
++#GRUB_BTRFS_MKCONFIG=/usr/bin/grub2-mkconfig
++
++# Snapper
++# Snapper's config name to use
++# Default: "root"
++#GRUB_BTRFS_SNAPPER_CONFIG="root"
++
++# Password protection management for submenu,snapshots
++# Refer to the Grub documentation https://www.gnu.org/software/grub/manual/grub/grub.html#Authentication-and-authorisation
++# and this comment https://github.com/Antynea/grub-btrfs/issues/95#issuecomment-682295660
++#
++# Add authorized usernames separate by comma (foo,bar)
++# When Grub's password protection is enabled, the superuser is authorized by default, it isn't necessary to add it
++# Default: ""
++#GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS="foo,bar"
++#
++# Disable authentication support for submenu of Grub-btrfs only (--unrestricted)
++# doesn't work if GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS isn't empty
++# Default: "false"
++#GRUB_BTRFS_DISABLE_PROTECTION_SUBMENU="true"
+diff --git config config
+index 4638b10..5ef3a84 100644
+--- config
++++ config
+@@ -1,122 +1,4 @@
+ #!/usr/bin/env bash
+-
+-# Disable grub-btrfs.
+-# Default: "false"
+-#GRUB_BTRFS_DISABLE="true"
+-
+-# Name appearing in the Grub menu.
+-# Default: "Use distribution information from /etc/os-release."
+-#GRUB_BTRFS_SUBMENUNAME="Arch Linux snapshots"
+-
+-# Add a name ahead your snapshots entries in the Grub menu.
+-# Default: "Snapshot:"
+-#GRUB_BTRFS_PREFIXENTRY="Snapshot:"
+-
+-# Show full path snapshot or only name in the Grub menu, weird reaction with snapper.
+-# Default: "true"
+-#GRUB_BTRFS_DISPLAY_PATH_SNAPSHOT="false"
+-
+-# Custom title.
+-# shows/hides p"prefix" d"date" n"name" in the Grub menu, separator "/", custom order available.
+-# Default: "p/d/n"
+-#GRUB_BTRFS_TITLE_FORMAT="p/d/n"
+-
+-# Limit the number of snapshots populated in the GRUB menu.
+-# Default: "50"
+-#GRUB_BTRFS_LIMIT="50"
+-
+-# Sort the found subvolumes by "ogeneration" or "generation" or "path" or "rootid".
+-# # See Sorting section to https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs-subvolume#SUBCOMMAND
+-# "-rootid" means list snapshot by new ones first.
+-# Default: "-rootid"
+-#GRUB_BTRFS_SUBVOLUME_SORT="+ogen,-gen,path,rootid"
+-
+-# Show snapshots found during run "grub-mkconfig"
+-# Default: "true"
+-#GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND="false"
+-
+-# Show Total of snapshots found during run "grub-mkconfig"
+-# Default: "true"
+-#GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND="true"
+-
+-# By default, "grub-btrfs" automatically detects most existing kernels.
+-# If you have one or more custom kernels, you can add them here.
+-# Default: ("")
+-#GRUB_BTRFS_NKERNEL=("kernel-custom" "vmlinux-custom")
+-
+-# By default, "grub-btrfs" automatically detects most existing initramfs.
+-# If you have one or more custom initramfs, you can add them here.
+-# Default: ("")
+-#GRUB_BTRFS_NINIT=("initramfs-custom.img" "initrd-custom.img" "otherinit-custom.gz")
+-
+-# By default, "grub-btrfs" automatically detects most existing microcodes.
+-# If you have one or more custom microcodes, you can add them here.
+-# Default: ("")
+-#GRUB_BTRFS_CUSTOM_MICROCODE=("custom-ucode.img" "custom-uc.img "custom_ucode.cpio")
+-
+-# Comma seperated mount options to be used when booting a snapshot.
+-# They can be defined here as well as in the "/" line inside the respective snapshots'
+-# "/etc/fstab" files.  Mount options found in both places are combined, and this variable
+-# takes priority over `fstab` entries.
+-# NB: Do NOT include "subvol=..." or "subvolid=..." here.
+-# Default: ""
+-#GRUB_BTRFS_ROOTFLAGS="space_cache,commit=10,norecovery"
+-
+-# Ignore specific path during run "grub-mkconfig".
+-# Only exact paths are ignored.
+-# e.g : if `specific path` = @, only `@` snapshot will be ignored.
+-# Default: ("@")
+-GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("@")
+-
+-# Ignore prefix path during run "grub-mkconfig".
+-# Any path starting with the specified string will be ignored.
+-# e.g : if `prefix path` = @, all snapshots beginning with "@/..." will be ignored.
+-# Default: ("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
+-GRUB_BTRFS_IGNORE_PREFIX_PATH=("var/lib/docker" "@var/lib/docker" "@/var/lib/docker")
+-
+-# By default "grub-btrfs" automatically detects your boot partition,
+-# either located at the system root or on a separate partition,
+-# but cannot detect if it is in a subvolume.
+-# Change to "true" if you have a boot partition in a different subvolume.
+-# Default: "false"
+-#GRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION="true"
+-
+-# Location of the folder containing the "grub.cfg" file.
+-# Use by grub-btrfs to save the file "grub-btrfs.cfg".
+-# Might be grub2 on some systems.
+-# For example, on Fedora with EFI : "/boot/efi/EFI/fedora"
+-# Default: "/boot/grub"
+-#GRUB_BTRFS_GRUB_DIRNAME="/boot/grub2"
+-
+-# Location of kernels/initramfs/microcode.
+-# Use by "grub-btrfs" to detect the boot partition and the location of kernels/initrafms/microcodes.
+-# Default: "/boot"
+-#GRUB_BTRFS_BOOT_DIRNAME="/boot"
+-
+-# Name/path of grub-mkconfig command, use by "grub-btrfs.service"
+-# Might be 'grub2-mkconfig' on some systems (Fedora ...)
+-# Default paths are /sbin:/bin:/usr/sbin:/usr/bin,
+-# if your path is missing, report it on the upstream project.
+-# For example, on Fedora : "/sbin/grub2-mkconfig"
+-# You can use only name or full path.
+-# Default: grub-mkconfig
+-#GRUB_BTRFS_MKCONFIG=/usr/bin/grub2-mkconfig
+-
+-# Snapper
+-# Snapper's config name to use
+-# Default: "root"
+-#GRUB_BTRFS_SNAPPER_CONFIG="root"
+-
+-# Password protection management for submenu,snapshots
+-# Refer to the Grub documentation https://www.gnu.org/software/grub/manual/grub/grub.html#Authentication-and-authorisation
+-# and this comment https://github.com/Antynea/grub-btrfs/issues/95#issuecomment-682295660
+-#
+-# Add authorized usernames separate by comma (foo,bar)
+-# When Grub's password protection is enabled, the superuser is authorized by default, it isn't necessary to add it
+-# Default: ""
+-#GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS="foo,bar"
+-#
+-# Disable authentication support for submenu of Grub-btrfs only (--unrestricted)
+-# doesn't work if GRUB_BTRFS_PROTECTION_AUTHORIZED_USERS isn't empty
+-# Default: "false"
+-#GRUB_BTRFS_DISABLE_PROTECTION_SUBMENU="true"
++for cfg in $(find /etc/default/grub-btrfs/conf.d -type f -name "*.cfg"); do
++	source "${cfg}"
++done
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 8c1a2f5954c9..0e646c9c3f82 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.8.1
+version=4.9
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,7 +9,7 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
 distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
+checksum=62461133c697643e98a608239773f500edee3e4055c5729fef6639d1cd610243
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

Re: grub-btrfs: update to 4.9; patch for modular configs

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 2012 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30195#issuecomment-818854386

Comment:
I agree with moving the file using `post_install()`. I would rather patch the source to reflect the new config path:

```
diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs
index 2a1f215..ca71206 100755
--- a/41_snapshots-btrfs
+++ b/41_snapshots-btrfs
@@ -41,7 +41,7 @@ prefix="/usr"
 exec_prefix="/usr"
 datarootdir="/usr/share"
 sysconfdir="/etc"
-grub_btrfs_config="${sysconfdir}/default/grub-btrfs/config"
+grub_btrfs_config="${sysconfdir}/conf.d/grub-btrfs"
 
 [[ -f "$grub_btrfs_config" ]] && . "$grub_btrfs_config"
 . "$datarootdir/grub/grub-mkconfig_lib"
diff --git a/Makefile b/Makefile
index 6ffe8c1..12c760d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ install:
                exit 1; \
        fi
        @install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
-       @install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
        @install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
        @install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.path
        @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
@@ -33,7 +32,6 @@ uninstall:
        fi
        @grub_dirname="$$(grep -oP '^[[:space:]]*GRUB_BTRFS_GRUB_DIRNAME=\K.*' "$(DESTDIR)/etc/default/grub-btrfs/config" | sed "s|\s*#.*||;s|(\s*\(.\+\)\s*)|\1|;s|['\"]||g")"; \
         rm -f "$${grub_dirname:-/boot/grub}/grub-btrfs.cfg"
-       @rm -f "$(DESTDIR)/etc/default/grub-btrfs/config"
        @rm -f "$(DESTDIR)/etc/grub.d/41_snapshots-btrfs"
        @rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.service"
        @rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.path"
```

and use `/etc/conf.d/grub-btrfs` (instead of `grub-btrfs.cfg`) so that it aligns with our naming scheme (as for `snapper`)
And maybe rename `grub-btrfs-runit` to `runit-grub-btrfs` for naming consistency (we have `runit-iptables` and `runit-kdump` for example)

Re: grub-btrfs: update to 4.9; patch for modular configs

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30195#issuecomment-818854386

Comment:
I agree with moving the file using `post_install()`. I would rather patch the source to reflect the new config path:

```diff
diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs
index 2a1f215..ca71206 100755
--- a/41_snapshots-btrfs
+++ b/41_snapshots-btrfs
@@ -41,7 +41,7 @@ prefix="/usr"
 exec_prefix="/usr"
 datarootdir="/usr/share"
 sysconfdir="/etc"
-grub_btrfs_config="${sysconfdir}/default/grub-btrfs/config"
+grub_btrfs_config="${sysconfdir}/conf.d/grub-btrfs"
 
 [[ -f "$grub_btrfs_config" ]] && . "$grub_btrfs_config"
 . "$datarootdir/grub/grub-mkconfig_lib"
diff --git a/Makefile b/Makefile
index 6ffe8c1..12c760d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ install:
                exit 1; \
        fi
        @install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
-       @install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
        @install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
        @install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.path
        @install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
@@ -33,7 +32,6 @@ uninstall:
        fi
        @grub_dirname="$$(grep -oP '^[[:space:]]*GRUB_BTRFS_GRUB_DIRNAME=\K.*' "$(DESTDIR)/etc/default/grub-btrfs/config" | sed "s|\s*#.*||;s|(\s*\(.\+\)\s*)|\1|;s|['\"]||g")"; \
         rm -f "$${grub_dirname:-/boot/grub}/grub-btrfs.cfg"
-       @rm -f "$(DESTDIR)/etc/default/grub-btrfs/config"
        @rm -f "$(DESTDIR)/etc/grub.d/41_snapshots-btrfs"
        @rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.service"
        @rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.path"
```

and use `/etc/conf.d/grub-btrfs` (instead of `grub-btrfs.cfg`) so that it aligns with our naming scheme (as for `snapper`)
And maybe rename `grub-btrfs-runit` to `runit-grub-btrfs` for naming consistency (we have `runit-iptables` and `runit-kdump` for example)

Re: grub-btrfs: update to 4.9; patch for modular configs

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30195#issuecomment-818904178

Comment:
All that said, I'd suggest talking this out with upstream; maybe they are open to officially supporting this setup. I don't like the thought of carrying patches forever :p

Re: [PR PATCH] [Updated] grub-btrfs: update to 4.9; patch for modular configs

[teldra]

[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages fix-grub-btrfs
https://github.com/void-linux/void-packages/pull/30195

grub-btrfs: update to 4.9; patch for modular configs
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-GLIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/30195.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-grub-btrfs-30195.patch --]
[-- Type: text/x-diff, Size: 1039 bytes --]

From 22c908bd0621917d56ce5248b9867e68afde1c47 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 13 Apr 2021 03:36:18 +0200
Subject: [PATCH] grub-btrfs: update to 4.9.

---
 srcpkgs/grub-btrfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 8c1a2f5954c9..0e646c9c3f82 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.8.1
+version=4.9
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,7 +9,7 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
 distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
+checksum=62461133c697643e98a608239773f500edee3e4055c5729fef6639d1cd610243
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

Re: grub-btrfs: update to 4.9.

[teldra]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/30195#issuecomment-819083220

Comment:
I have proposed changes upstream: https://github.com/Antynea/grub-btrfs/pull/150 so I just update this for now.
 

Re: [PR PATCH] [Merged]: grub-btrfs: update to 4.9.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

There's a merged pull request on the void-packages repository

grub-btrfs: update to 4.9.
https://github.com/void-linux/void-packages/pull/30195

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-GLIBC)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl

Re: grub-btrfs: update to 4.9.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/30195#issuecomment-819480332

Comment:
Is this package built and tested? f01490cac7