From: FollieHiyuki <FollieHiyuki@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] grub-btrfs: update to 4.8.1
Date: Wed, 03 Feb 2021 02:28:45 +0100 [thread overview]
Message-ID: <20210203012845.K2ox2Re9z3YRFNSCh2c8VN894jBAgwTPhDPlB-bbd_s@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28288@inbox.vuxu.org>
[-- 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
+ }
+}
next prev parent reply other threads:[~2021-02-03 1:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 16:37 [PR PATCH] " FollieHiyuki
2021-01-28 16:39 ` FollieHiyuki
2021-01-28 17:19 ` ericonr
2021-01-28 19:39 ` FollieHiyuki
2021-02-03 0:48 ` [PR PATCH] [Updated] [WIP] " FollieHiyuki
2021-02-03 0:53 ` FollieHiyuki
2021-02-03 1:02 ` ericonr
2021-02-03 1:05 ` [PR REVIEW] " ericonr
2021-02-03 1:18 ` [PR PATCH] [Updated] " FollieHiyuki
2021-02-03 1:18 ` FollieHiyuki
2021-02-03 1:28 ` FollieHiyuki [this message]
2021-02-03 1:46 ` FollieHiyuki
2021-02-03 2:03 ` [PR PATCH] [Updated] " FollieHiyuki
2021-02-03 2:05 ` FollieHiyuki
2021-02-03 2:07 ` FollieHiyuki
2021-02-03 2:49 ` ericonr
2021-02-03 3:05 ` FollieHiyuki
2021-02-03 3:19 ` [PR REVIEW] " ahesford
2021-02-03 3:19 ` ahesford
2021-02-03 5:53 ` FollieHiyuki
2021-02-03 5:53 ` [PR PATCH] [Updated] " FollieHiyuki
2021-02-15 17:23 ` ericonr
2021-02-15 18:38 ` FollieHiyuki
2021-02-20 7:13 ` [PR REVIEW] grub-btrfs: update to 4.8.1 + add runit service ericonr
2021-02-20 7:14 ` [PR PATCH] [Merged]: " ericonr
2021-02-20 13:48 ` [PR REVIEW] " FollieHiyuki
2021-02-20 14:06 ` ahesford
2021-02-20 14:30 ` FollieHiyuki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210203012845.K2ox2Re9z3YRFNSCh2c8VN894jBAgwTPhDPlB-bbd_s@z \
--to=folliehiyuki@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).