wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-20 00:08:58 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

app-crypt/clevis: fix for dracut on openRC

Browse Source 
Signed-off-by: Julien Roy <julien@jroy.ca>
This commit is contained in:
Julien Roy 2023-02-03 22:40:03 -05:00
parent cd45860bfa
commit 08ea01112a
No known key found for this signature in database
GPG Key ID: BEF2297448848842
3 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app-crypt/clevis/Manifest
View File

@ -1,2 +1 @@
DIST clevis-18.tar.gz 78191 BLAKE2B 317f30df3c05a9a651363daf17b9320e47a903929af991ecfd9d4d3d630a0ab8e92815db2e5736e9b9ca7f3fb4a41f4cf198ec447f04a9849f4d2a03bb196b22 SHA512 19b6743ff61ff7e29699bbc3fb69dfa31567a37ab824629330b57c92aa89b70759d63c1770be68d4525681ec9ba56d980cae2bb1cdeee6192992ede449a0e4ff
DIST clevis-19.tar.gz 81324 BLAKE2B 75323940d0b53e307f5dbc197e3117e7ddc900d76ae1043bac3d17cc3af0264ba00a5f840c5c9dd3c2dd9c8fbde2cf05934b8ab3e89cd403ad8a8eb28609bb78 SHA512 dee19354c908c3843fc295a84b431780d5d6062c77766ee7ce9550636d3623d92b0cd1f6d4c40d57bef14debddc161da2b72289a5d6185cdd17b09a1ef67409a

4
app-crypt/clevis/clevis-19.ebuild → app-crypt/clevis/clevis-19-r1.ebuild
View File

@ -27,5 +27,9 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
# From https://github.com/latchset/clevis/pull/347
# Allows using dracut without systemd
"${FILESDIR}/clevis-dracut.patch"
# Fix for systemd on Gentoo
"${FILESDIR}/clevis-meson.patch"
)

52
app-crypt/clevis/files/clevis-dracut.patch
View File

@ -1,45 +1,3 @@
From a5aa695821e34fb218c7d705065aaf7077737c8c Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Fri, 5 Nov 2021 15:24:12 +0000
Subject: [PATCH] Moved dracut directory up to top-level to decouple it with
systemd.
Adds a clevis-luks-generic-unlocker for alternative use without systemd.
Based on patch by Sergio Correia <scorreia@redhat.com>
Closes: #346
Signed-off-by: Jonathan Davies <jpds@protonmail.com>
---
.../dracut/clevis-pin-sss/meson.build | 0
.../dracut/clevis-pin-sss/module-setup.sh.in | 0
.../dracut/clevis-pin-tang/meson.build | 0
.../dracut/clevis-pin-tang/module-setup.sh.in | 0
.../dracut/clevis-pin-tpm2/meson.build | 0
.../dracut/clevis-pin-tpm2/module-setup.sh.in | 0
src/dracut/clevis/clevis-hook.sh.in | 3 +
.../clevis/clevis-luks-generic-unlocker | 70 +++++++++++++++++++
.../systemd => }/dracut/clevis/meson.build | 1 +
.../dracut/clevis/module-setup.sh.in | 19 +++--
src/{luks/systemd => }/dracut/meson.build | 0
.../systemd/dracut/clevis/clevis-hook.sh.in | 2 -
src/luks/systemd/meson.build | 1 -
src/meson.build | 1 +
14 files changed, 90 insertions(+), 7 deletions(-)
rename src/{luks/systemd => }/dracut/clevis-pin-sss/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-sss/module-setup.sh.in (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tang/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tang/module-setup.sh.in (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/meson.build (100%)
rename src/{luks/systemd => }/dracut/clevis-pin-tpm2/module-setup.sh.in (100%)
create mode 100755 src/dracut/clevis/clevis-hook.sh.in
create mode 100755 src/dracut/clevis/clevis-luks-generic-unlocker
rename src/{luks/systemd => }/dracut/clevis/meson.build (87%)
rename src/{luks/systemd => }/dracut/clevis/module-setup.sh.in (76%)
rename src/{luks/systemd => }/dracut/meson.build (100%)
delete mode 100755 src/luks/systemd/dracut/clevis/clevis-hook.sh.in
diff --git a/src/luks/systemd/dracut/clevis-pin-sss/meson.build b/src/dracut/clevis-pin-sss/meson.build
similarity index 100%
rename from src/luks/systemd/dracut/clevis-pin-sss/meson.build
@ -213,9 +171,17 @@ index bfe657c..dbce790 100755
grep sed cut \
clevis-decrypt \
diff --git a/src/luks/systemd/dracut/meson.build b/src/dracut/meson.build
similarity index 100%
similarity index 78%
rename from src/luks/systemd/dracut/meson.build
rename to src/dracut/meson.build
index 7ad5b14..fdb264b 100644
--- a/src/luks/systemd/dracut/meson.build
+++ b/src/dracut/meson.build
@@ -2,4 +2,3 @@ subdir('clevis')
subdir('clevis-pin-tang')
subdir('clevis-pin-tpm2')
subdir('clevis-pin-sss')
-subdir('clevis-pin-null')
diff --git a/src/luks/systemd/dracut/clevis/clevis-hook.sh.in b/src/luks/systemd/dracut/clevis/clevis-hook.sh.in
deleted file mode 100755
index cb257c9..0000000