[PR PATCH] grub-btrfs: update to 4.8.1

[PR PATCH] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages grub-btrfs
https://github.com/void-linux/void-packages/pull/28288

grub-btrfs: update to 4.8.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 2e9a16d991279abef22ac6496e1f4de4ec09713b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH] grub-btrfs: update to 4.8.1

---
 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 fd8efe3b657..bf21d1b5066 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
+version=4.8.1
 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

Re: grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-769212958

Comment:
This is just a minor version, but I want to include a replacement for upstream's systemd service if possible.
@ericonr can you make some suggestions about this?

Re: grub-btrfs: update to 4.8.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-769242661

Comment:
I'd suggest something close to how we have `dracut-uefi`. It's a sub package which pulls in the dependencies specific to UEFI, and also includes some files of our own (in this case, the kernel hooks; in your case, it'd be the service file, assuming it can be implemented cleanly).

Re: grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-769326600

Comment:
I will look into it. For now please don't merge

Re: [PR PATCH] [Updated] [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages grub-btrfs
https://github.com/void-linux/void-packages/pull/28288

[WIP] grub-btrfs: update to 4.8.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From f38faa86b586d6879563e0798b96fbfd0542565d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH] grub-btrfs: update to 4.8.1

---
 srcpkgs/grub-btrfs-runit                 |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/conf |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/run  |  5 +++++
 srcpkgs/grub-btrfs/template              | 13 +++++++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/grub-btrfs-runit
 create mode 100644 srcpkgs/grub-btrfs/files/grub-btrfs/conf
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/run

diff --git a/srcpkgs/grub-btrfs-runit b/srcpkgs/grub-btrfs-runit
new file mode 120000
index 00000000000..ad9b415a9d8
--- /dev/null
+++ b/srcpkgs/grub-btrfs-runit
@@ -0,0 +1 @@
+grub-btrfs
\ No newline at end of file
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/conf b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
new file mode 100644
index 00000000000..75d1f2ceca8
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
@@ -0,0 +1 @@
+SNAPSHOTS_PATH=/.snapshots
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
new file mode 100755
index 00000000000..f6ec33d3a6b
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec wendy -m 768 -w "${SNAPSHOTS_PATH}" bash -c \
+ 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi' 2>&1
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index fd8efe3b657..8c1a2f5954c 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
+version=4.8.1
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,8 +9,17 @@ 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
+
+grub-btrfs-runit_package() {
+	depends="wendy ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - runit service"
+
+	pkg_install() {
+		vsv grub-btrfs
+	}
+}

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772122154

Comment:
I can't think of any ways to make the service file without additional dependencies.
My implementation with `inotify-tools` is kind of messy, so I shamelessly took the `wendy` route from @circhioz.
Advice is welcomed.

Re: [WIP] grub-btrfs: update to 4.8.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772127421

Comment:
Please mention in the commit message that you added the service :)

Re: [PR REVIEW] [WIP] grub-btrfs: update to 4.8.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r569038268

Comment:
```suggestion
[ -r conf ] && . ./conf
exec 2>&1
exec wendy -m 768 -w "${SNAPSHOTS_PATH}" bash -c \
 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
```

Re: [PR PATCH] [Updated] [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages grub-btrfs
https://github.com/void-linux/void-packages/pull/28288

[WIP] grub-btrfs: update to 4.8.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 6362516b7d0fe165f3e35e037a1aa2f1f9dd64bf Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH] grub-btrfs: update to 4.8.1

Added a service file to auto-update grub menu on changes
in /.snapshots directory
---
 srcpkgs/grub-btrfs-runit                 |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/conf |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/run  |  6 ++++++
 srcpkgs/grub-btrfs/template              | 13 +++++++++++--
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/grub-btrfs-runit
 create mode 100644 srcpkgs/grub-btrfs/files/grub-btrfs/conf
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/run

diff --git a/srcpkgs/grub-btrfs-runit b/srcpkgs/grub-btrfs-runit
new file mode 120000
index 00000000000..ad9b415a9d8
--- /dev/null
+++ b/srcpkgs/grub-btrfs-runit
@@ -0,0 +1 @@
+grub-btrfs
\ No newline at end of file
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/conf b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
new file mode 100644
index 00000000000..75d1f2ceca8
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
@@ -0,0 +1 @@
+SNAPSHOTS_PATH=/.snapshots
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
new file mode 100755
index 00000000000..a160fab9af0
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec 2>&1
+exec wendy -m 768 -w "${SNAPSHOTS_PATH}" bash -c \
+ 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index fd8efe3b657..8c1a2f5954c 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
+version=4.8.1
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,8 +9,17 @@ 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
+
+grub-btrfs-runit_package() {
+	depends="wendy ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - runit service"
+
+	pkg_install() {
+		vsv grub-btrfs
+	}
+}

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772133691

Comment:
I added the commit message. Will look into `vlogger` later

Re: [PR PATCH] [Updated] [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages grub-btrfs
https://github.com/void-linux/void-packages/pull/28288

[WIP] grub-btrfs: update to 4.8.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 94c106402c69571655c22f363d56faf4c35eb9ea Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH] grub-btrfs: update to 4.8.1

Added a service file to auto-update grub menu on changes
in /.snapshots directory
---
 srcpkgs/grub-btrfs-runit                    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/conf    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/log/run |  3 +++
 srcpkgs/grub-btrfs/files/grub-btrfs/run     |  6 ++++++
 srcpkgs/grub-btrfs/template                 | 13 +++++++++++--
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/grub-btrfs-runit
 create mode 100644 srcpkgs/grub-btrfs/files/grub-btrfs/conf
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/log/run
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/run

diff --git a/srcpkgs/grub-btrfs-runit b/srcpkgs/grub-btrfs-runit
new file mode 120000
index 00000000000..ad9b415a9d8
--- /dev/null
+++ b/srcpkgs/grub-btrfs-runit
@@ -0,0 +1 @@
+grub-btrfs
\ No newline at end of file
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/conf b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
new file mode 100644
index 00000000000..75d1f2ceca8
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
@@ -0,0 +1 @@
+SNAPSHOTS_PATH=/.snapshots
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
new file mode 100755
index 00000000000..af369d5f5fc
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec vlogger -t grub-btrfs
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
new file mode 100755
index 00000000000..a160fab9af0
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec 2>&1
+exec wendy -m 768 -w "${SNAPSHOTS_PATH}" bash -c \
+ 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index fd8efe3b657..8c1a2f5954c 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
+version=4.8.1
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,8 +9,17 @@ 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
+
+grub-btrfs-runit_package() {
+	depends="wendy ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - runit service"
+
+	pkg_install() {
+		vsv grub-btrfs
+	}
+}

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772133691

Comment:
I added the commit message. Will look into `vlogger` later

Re: [PR PATCH] [Updated] [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages grub-btrfs
https://github.com/void-linux/void-packages/pull/28288

[WIP] grub-btrfs: update to 4.8.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9e0c9cf0564e42b6b0b28c229b4a66d6587412b5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH] grub-btrfs: update to 4.8.1

Added a service file to auto-update grub menu on changes
in /.snapshots directory
---
 srcpkgs/grub-btrfs-runit                    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/conf    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/log/run |  2 ++
 srcpkgs/grub-btrfs/files/grub-btrfs/run     |  6 ++++++
 srcpkgs/grub-btrfs/template                 | 13 +++++++++++--
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/grub-btrfs-runit
 create mode 100644 srcpkgs/grub-btrfs/files/grub-btrfs/conf
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/log/run
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/run

diff --git a/srcpkgs/grub-btrfs-runit b/srcpkgs/grub-btrfs-runit
new file mode 120000
index 00000000000..ad9b415a9d8
--- /dev/null
+++ b/srcpkgs/grub-btrfs-runit
@@ -0,0 +1 @@
+grub-btrfs
\ No newline at end of file
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/conf b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
new file mode 100644
index 00000000000..75d1f2ceca8
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
@@ -0,0 +1 @@
+SNAPSHOTS_PATH=/.snapshots
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
new file mode 100755
index 00000000000..267659045cd
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t grub-btrfs
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
new file mode 100755
index 00000000000..f55d7f33311
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+exec 2>&1
+exec wendy -v -m 768 -w "${SNAPSHOTS_PATH}" bash -c \
+ 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index fd8efe3b657..8c1a2f5954c 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
+version=4.8.1
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,8 +9,17 @@ 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
+
+grub-btrfs-runit_package() {
+	depends="wendy ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - runit service"
+
+	pkg_install() {
+		vsv grub-btrfs
+	}
+}

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772154313

Comment:
I added a `-v` option to wendy, since it might be useful when logging.
The log contains the output of `update-grub` too, which doesn't seem useful to me. Should we disable logging for the command output (only display when there are errors)?

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772154313

Comment:
I added a `-v` option to wendy, since it might be useful when logging.
The log contains the output of `update-grub` too, which doesn't seem useful to me. Should we disable logging for the command output (only display if there are errors when the command runs)?

Re: [WIP] grub-btrfs: update to 4.8.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772177383

Comment:
Honestly, your choice. I don't use grub or btrfs. Make a service you're comfortable with, we can improve some piece of it if someone suggests changes or complains.

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772183947

Comment:
I guess we can keep the service as it is right now. Seeing some more log doesn't hurt.

Re: [PR REVIEW] [WIP] grub-btrfs: update to 4.8.1

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r569100671

Comment:
You probably want to put this above the conf source just in case there are some error messages printed while sourcing the conf file.

Re: [PR REVIEW] [WIP] grub-btrfs: update to 4.8.1

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r569103232

Comment:
1. Omit the `-v` here and add some logic that will recognize a variable like `VERBOSE` that can be set in the `conf` file to govern the addition of `-v`. This could be a catch-all `OPTS` variable like other services uses, but there probably isn't much value in allowing other flags, since you want tighter control on the path and mode anyway.
2. Is mode 768 sufficient? If snapshots can be renamed, you might also need bits for `IN_MOVE` or the `IN_MOVED_{TO,FROM}`.  You should do some experiments to see what kind of events a snapshot create/rename/destroy trigger.
3. You should probably verify that `SNAPSHOTS_PATH` is non-empty and either fail or substitute a default when it is.

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-772252089

Comment:
Thanks @ahesford for all the feedbacks.
The only features of btrfs I use are compression and snapshoting, so I doubt I know any better :)
> Omit the -v here and add some logic that will recognize a variable like VERBOSE that can be set in the conf file to govern the addition of -v. This could be a catch-all OPTS variable like other services uses, but there probably isn't much value in allowing other flags, since you want tighter control on the path and mode anyway.

I keep the OPTS variable. There could be a use case for it, for example `-r` when the user manages snapshots inside multiple sub directories. Adding `-d` would be a sanity check too.
> Is mode 768 sufficient? If snapshots can be renamed, you might also need bits for IN_MOVE or the IN_MOVED_{TO,FROM}. You should do some experiments to see what kind of events a snapshot create/rename/destroy trigger.

I added IN_MOVE bit.
AFAIK btrfs snapshots are subvolumes, and they can be treated as normal directories (delete wirh `rm -r`, rename wirh `mv`) so I guess it emits events as normal directories in the file system. Apparently the service at least works on my system with all 3 events.
> You should probably verify that SNAPSHOTS_PATH is non-empty and either fail or substitute a default when it is.

Since `wendy` will do nothing if the directory doesn't exist, I added the check for that case. Having to check for SNAPSHOTS_PATH value as well will be complicating, so I keep a default value in the `conf` file

Re: [PR PATCH] [Updated] [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages grub-btrfs
https://github.com/void-linux/void-packages/pull/28288

[WIP] grub-btrfs: update to 4.8.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 74625fd98f929c39843eb9b815809c4685295587 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH] grub-btrfs: update to 4.8.1

Added a service file to auto-update grub menu on changes
in /.snapshots directory
---
 srcpkgs/grub-btrfs-runit                    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/conf    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/log/run |  2 ++
 srcpkgs/grub-btrfs/files/grub-btrfs/run     | 12 ++++++++++++
 srcpkgs/grub-btrfs/template                 | 13 +++++++++++--
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/grub-btrfs-runit
 create mode 100644 srcpkgs/grub-btrfs/files/grub-btrfs/conf
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/log/run
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/run

diff --git a/srcpkgs/grub-btrfs-runit b/srcpkgs/grub-btrfs-runit
new file mode 120000
index 00000000000..ad9b415a9d8
--- /dev/null
+++ b/srcpkgs/grub-btrfs-runit
@@ -0,0 +1 @@
+grub-btrfs
\ No newline at end of file
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/conf b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
new file mode 100644
index 00000000000..75d1f2ceca8
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
@@ -0,0 +1 @@
+SNAPSHOTS_PATH=/.snapshots
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
new file mode 100755
index 00000000000..267659045cd
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t grub-btrfs
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
new file mode 100755
index 00000000000..3ee37633027
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+exec 2>&1
+[ -r conf ] && . ./conf
+
+if [ -d "${SNAPSHOTS_PATH}" ]
+then
+	exec wendy ${OPTS} -m 960 -w "${SNAPSHOTS_PATH}" bash -c \
+	 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
+else
+  exit 1
+fi
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index fd8efe3b657..8c1a2f5954c 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
+version=4.8.1
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,8 +9,17 @@ 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
+
+grub-btrfs-runit_package() {
+	depends="wendy ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - runit service"
+
+	pkg_install() {
+		vsv grub-btrfs
+	}
+}

Re: [WIP] grub-btrfs: update to 4.8.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-779360691

Comment:
Is this ready to be reviewed?

Re: [WIP] grub-btrfs: update to 4.8.1

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#issuecomment-779392561

Comment:
Yes please do

Re: [PR REVIEW] grub-btrfs: update to 4.8.1 + add runit service

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r579613390

Comment:
I don't think `bash` should be hardcoded here, but it's guaranteed to be pulled in by the package, so leaving as is for now.

Re: [PR PATCH] [Merged]: grub-btrfs: update to 4.8.1 + add runit service

[ericonr]

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

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

grub-btrfs: update to 4.8.1 + add runit service
https://github.com/void-linux/void-packages/pull/28288

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

#### General
- [ ] 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
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: [PR REVIEW] grub-btrfs: update to 4.8.1 + add runit service

[FollieHiyuki]

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

New review comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r579659546

Comment:
@ericonr that command is taken from upstream's systemd service. I don't think they will switch to POSIX sh, so it would be fine

Re: [PR REVIEW] grub-btrfs: update to 4.8.1 + add runit service

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r579661626

Comment:
Upstream might use bash in a systemd service, but they aren't providing a runit service, so we should adopt Void idioms when adapting our own. There is nothing specific to bash, so /bin/sh is the way to go here.

Re: [PR REVIEW] grub-btrfs: update to 4.8.1 + add runit service

[FollieHiyuki]

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

New review comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/28288#discussion_r579664299

Comment:
That sounds reasonable. I will make the change