[gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/

[Thomas Deutschmann]

commit:     aa0e4e5d3db44547983d0a227f62afde7754f417
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 20:46:09 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 22:56:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aa0e4e5d

cryptsetup: Enable UDEV support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh        |  2 +-
 gkbuilds/cryptsetup.gkbuild | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 3de9470..a4f15d6 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -46,7 +46,7 @@ 
GKPKG_COREUTILS_BINPKG="${GKPKG_COREUTILS_BINPKG:-%%CACHE%%/coreutils-${GKPKG_CO
 
 GKPKG_CRYPTSETUP_PN="cryptsetup"
 GKPKG_CRYPTSETUP_PV="${GKPKG_CRYPTSETUP_PV:-VERSION_CRYPTSETUP}"
-GKPKG_CRYPTSETUP_DEPS="util-linux json-c popt libgpg-error libgcrypt lvm"
+GKPKG_CRYPTSETUP_DEPS="util-linux eudev json-c popt libgpg-error libgcrypt lvm"
 
GKPKG_CRYPTSETUP_SRCTAR="${GKPKG_CRYPTSETUP_SRCTAR:-${DISTDIR}/cryptsetup-${GKPKG_CRYPTSETUP_PV}.tar.xz}"
 
GKPKG_CRYPTSETUP_SRCDIR="${GKPKG_CRYPTSETUP_SRCDIR:-cryptsetup-${GKPKG_CRYPTSETUP_PV}}"
 
GKPKG_CRYPTSETUP_BINPKG="${GKPKG_CRYPTSETUP_BINPKG:-%%CACHE%%/cryptsetup-${GKPKG_CRYPTSETUP_PV}-%%ARCH%%.tar.xz}"

diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
index a99ce28..57fc537 100644
--- a/gkbuilds/cryptsetup.gkbuild
+++ b/gkbuilds/cryptsetup.gkbuild
@@ -1,17 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
        export ac_cv_header_security_pam_misc_h=no
        export ac_cv_header_security_pam_appl_h=no
 
+       # devicemapper needs to find udev
+       append-ldflags -Wl,-rpath-link,${BROOT}/usr/lib
+
        local myconf=(
                --enable-internal-argon2
                --sbindir=/sbin
                --disable-nls
+               --disable-selinux
+               --disable-veritysetup
+               --disable-cryptsetup-reencrypt
+               --disable-integritysetup
                --enable-static=yes
                --enable-shared=no
                --enable-static-cryptsetup
+               --enable-udev
                --with-crypto_backend=gcrypt
        )