From: jirutka <jirutka@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mkinitcpio: remove dependency on -lvm2 from -encrypt subpackage
Date: Thu, 08 Jul 2021 18:50:04 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31859@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]
There is a new pull request by jirutka against master on the void-packages repository
https://github.com/jirutka/void-packages mkinitcpio-encrypt
https://github.com/void-linux/void-packages/pull/31859
mkinitcpio: remove dependency on -lvm2 from -encrypt subpackage
encrypt hook does not depend on lvm2 nor lvm2 hook. It just needs 11-dm-initramfs.rules, so I moved to the base package.
<!-- 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/31859.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio-encrypt-31859.patch --]
[-- Type: text/x-diff, Size: 1954 bytes --]
From 27a1bf2da9aac2c41c428d43346e5220a55a954f Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 9 Jul 2021 18:38:43 +0200
Subject: [PATCH] mkinitcpio: remove dependency on -lvm2 from -encrypt
subpackage
encrypt hook does not depend on lvm2 nor lvm2 hook. It just needs
11-dm-initramfs.rules, so I moved to the base package.
---
srcpkgs/mkinitcpio/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index d3f89d781382..ee5ff2025d5a 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
# Template file for 'mkinitcpio'
pkgname=mkinitcpio
version=30
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="asciidoc"
depends="busybox-static bsdtar bash"
@@ -24,6 +24,9 @@ post_install() {
vinstall ${FILESDIR}/udev_hook 644 usr/lib/initcpio/hooks udev
vinstall ${FILESDIR}/udev_install 644 usr/lib/initcpio/install udev
+ # Install udev rule used by both lvm2 and encrypt hook
+ vinstall ${FILESDIR}/11-dm-initramfs.rules 644 usr/lib/initcpio/udev
+
# Remove unneeded systemd bits
rm -rf ${DESTDIR}/usr/lib/kernel
rm -rf ${DESTDIR}/usr/lib/systemd
@@ -45,15 +48,12 @@ mkinitcpio-lvm2_package() {
pkg_install() {
vinstall ${FILESDIR}/lvm2_hook 644 usr/lib/initcpio/hooks lvm2
vinstall ${FILESDIR}/lvm2_install 644 usr/lib/initcpio/install lvm2
- for RULES in ${FILESDIR}/*.rules; do
- vinstall $RULES 644 usr/lib/initcpio/udev $(basename $RULES)
- done
+ vinstall ${FILESDIR}/69-dm-lvm-metad.rules 644 usr/lib/initcpio/udev
}
}
mkinitcpio-encrypt_package() {
- depends="${sourcepkg}>=${version}_${revision}
- ${sourcepkg}-lvm2>=${version}_${revision} cryptsetup"
+ depends="${sourcepkg}>=${version}_${revision} cryptsetup"
short_desc+=" - encrypt support"
pkg_install() {
vinstall ${FILESDIR}/encrypt_hook 644 usr/lib/initcpio/hooks encrypt
next reply other threads:[~2021-07-08 16:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 16:50 jirutka [this message]
2021-07-08 18:11 ` ericonr
2021-07-08 19:10 ` thypon
2021-07-15 16:59 ` jirutka
2021-07-15 17:00 ` jirutka
2021-07-15 21:35 ` [PR PATCH] [Merged]: " ericonr
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-31859@inbox.vuxu.org \
--to=jirutka@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).