From: teldra <teldra@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] grub-btrfs: patch for modular configs
Date: Tue, 13 Apr 2021 03:41:28 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30195@inbox.vuxu.org> (raw)
[-- 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"
next reply other threads:[~2021-04-13 1:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 1:41 teldra [this message]
2021-04-13 7:12 ` [PR PATCH] [Updated] " teldra
2021-04-13 7:13 ` [PR PATCH] [Updated] grub-btrfs: update to 4.9; " teldra
2021-04-13 16:03 ` FollieHiyuki
2021-04-13 16:11 ` FollieHiyuki
2021-04-13 17:14 ` ericonr
2021-04-13 22:03 ` [PR PATCH] [Updated] " teldra
2021-04-13 22:04 ` grub-btrfs: update to 4.9 teldra
2021-04-14 12:07 ` [PR PATCH] [Merged]: " ericonr
2021-04-14 12:29 ` sgn
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30195@inbox.vuxu.org \
--to=teldra@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).