public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/
@ 2021-03-13 15:42 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2021-03-13 15:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0b9f8e012a51eecd3df1a86b4ca639de85537e33
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 15:40:49 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 15:41:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b9f8e01

Bump strace to v5.11

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

 defaults/software.sh    | 2 +-
 gkbuilds/strace.gkbuild | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index e938584..291bad4 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -186,7 +186,7 @@ GKPKG_POPT_BINPKG="${GKPKG_POPT_BINPKG:-%%CACHE%%/popt-${GKPKG_POPT_PV}-%%ARCH%%
 
 GKPKG_STRACE_PN="strace"
 GKPKG_STRACE_PV="${GKPKG_STRACE_PV:-VERSION_STRACE}"
-GKPKG_STRACE_DEPS=""
+GKPKG_STRACE_DEPS="libaio"
 GKPKG_STRACE_SRCTAR="${GKPKG_STRACE_SRCTAR:-${DISTDIR}/strace-${GKPKG_STRACE_PV}.tar.xz}"
 GKPKG_STRACE_SRCDIR="${GKPKG_STRACE_SRCDIR:-strace-${GKPKG_STRACE_PV}}"
 GKPKG_STRACE_BINPKG="${GKPKG_STRACE_BINPKG:-%%CACHE%%/strace-${GKPKG_STRACE_PV}-%%ARCH%%.tar.xz}"

diff --git a/gkbuilds/strace.gkbuild b/gkbuilds/strace.gkbuild
index 62399ce..d32a4b7 100644
--- a/gkbuilds/strace.gkbuild
+++ b/gkbuilds/strace.gkbuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
 	append-ldflags -static -pthread
-	export ac_cv_header_libaio_h=yes
 
 	local myconf=(
+		--disable-gcc-Werror
 		--enable-mpers=check
+		--enable-static
 		--without-libunwind
 		--without-libdw
 	)
@@ -19,8 +20,8 @@ src_configure() {
 src_install() {
 	mkdir -p "${D}"/usr/bin || die "Failed to create '${D}/usr/bin'!"
 
-	cp -a strace "${D}"/usr/bin/ \
-		|| die "Failed to copy '${S}/strace' to '${D}/usr/bin/'!"
+	cp -a src/strace "${D}"/usr/bin/ \
+		|| die "Failed to copy '${S}/src/strace' to '${D}/usr/bin/'!"
 
 	"${STRIP}" --strip-all "${D}"/usr/bin/strace \
 		|| die "Failed to strip '${D}/usr/bin/strace'!"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/
@ 2023-07-27 10:42 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-07-27 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     45b3d3aa452103994e9349b29357944c8b39bad6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 10:42:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 10:42:28 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=45b3d3aa

Add userspace-rcu (new dep of xfsprogs)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 defaults/software.sh           |  9 ++++++++-
 gkbuilds/userspace-rcu.gkbuild | 13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 0dce9e1..5c75a4e 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -219,6 +219,13 @@ GKPKG_UNIONFS_FUSE_SRCTAR="${GKPKG_UNIONFS_FUSE_SRCTAR:-${DISTDIR}/unionfs-fuse-
 GKPKG_UNIONFS_FUSE_SRCDIR="${GKPKG_UNIONFS_FUSE_SRCDIR:-unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}}"
 GKPKG_UNIONFS_FUSE_BINPKG="${GKPKG_UNIONFS_FUSE_BINPKG:-%%CACHE%%/unionfs-fuse-${GKPKG_UNIONFS_FUSE_PV}-%%ARCH%%.tar.xz}"
 
+GKPKG_USERSPACE_RCU_PN="userspace-rcu"
+GKPKG_USERSPACE_RCU_PV="${GKPKG_USERSPACE_RCU_PV:-VERSION_USERSPACE_RCU}"
+GKPKG_USERSPACE_RCU_DEPS=""
+GKPKG_USERSPACE_RCU_SRCTAR="${GKPKG_UTIL_LINUX_SRCTAR:-${DISTDIR}/userspace-rcu-${GKPKG_USERSPACE_RCU_PV}.tar.bz2}"
+GKPKG_USERSPACE_RCU_SRCDIR="${GKPKG_UTIL_LINUX_SRCDIR:-userspace-rcu-${GKPKG_USERSPACE_RCU_PV}}"
+GKPKG_USERSPACE_RCU_BINPKG="${GKPKG_UTIL_LINUX_BINPKG:-%%CACHE%%/userspace-rcu-${GKPKG_USERSPACE_RCU_PV}-%%ARCH%%.tar.xz}"
+
 GKPKG_UTIL_LINUX_PN="util-linux"
 GKPKG_UTIL_LINUX_PV="${GKPKG_UTIL_LINUX_PV:-VERSION_UTIL_LINUX}"
 GKPKG_UTIL_LINUX_DEPS=""
@@ -228,7 +235,7 @@ GKPKG_UTIL_LINUX_BINPKG="${GKPKG_UTIL_LINUX_BINPKG:-%%CACHE%%/util-linux-${GKPKG
 
 GKPKG_XFSPROGS_PN="xfsprogs"
 GKPKG_XFSPROGS_PV="${GKPKG_XFSPROGS_PV:-VERSION_XFSPROGS}"
-GKPKG_XFSPROGS_DEPS="util-linux"
+GKPKG_XFSPROGS_DEPS="util-linux userspace-rcu"
 GKPKG_XFSPROGS_SRCTAR="${GKPKG_XFSPROGS_SRCTAR:-${DISTDIR}/xfsprogs-${GKPKG_XFSPROGS_PV}.tar.xz}"
 GKPKG_XFSPROGS_SRCDIR="${GKPKG_XFSPROGS_SRCDIR:-xfsprogs-${GKPKG_XFSPROGS_PV}}"
 GKPKG_XFSPROGS_BINPKG="${GKPKG_XFSPROGS_BINPKG:-%%CACHE%%/xfsprogs-${GKPKG_XFSPROGS_PV}-%%ARCH%%.tar.xz}"

diff --git a/gkbuilds/userspace-rcu.gkbuild b/gkbuilds/userspace-rcu.gkbuild
new file mode 100644
index 0000000..5b4b7bf
--- /dev/null
+++ b/gkbuilds/userspace-rcu.gkbuild
@@ -0,0 +1,13 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+src_configure() {
+	gkconf --enable-static
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}"/usr/share
+}
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/
@ 2021-07-06  0:25 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2021-07-06  0:25 UTC (permalink / raw
  To: gentoo-commits

commit:     8fa4d682493e704cfdea5c51aecc26af868e9d97
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 22:36:00 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 23:40:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8fa4d682

defaults/software.sh: Add libxcrypt

Needed for BusyBox when host system is using sys-libs/libxcrypt[-static-libs]
which is usually enforced via package.use.force.

Bug: https://bugs.gentoo.org/798468
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/software.sh       |  9 ++++++++-
 gkbuilds/libxcrypt.gkbuild | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 291bad4..54836ad 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -39,7 +39,7 @@ GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GK
 
 GKPKG_BUSYBOX_PN="busybox"
 GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-VERSION_BUSYBOX}"
-GKPKG_BUSYBOX_DEPS=""
+GKPKG_BUSYBOX_DEPS="libxcrypt"
 GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX_PV}.tar.bz2}"
 GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}"
 GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}"
@@ -156,6 +156,13 @@ GKPKG_LIBGPG_ERROR_SRCTAR="${GKPKG_LIBGPG_ERROR_SRCTAR:-${DISTDIR}/libgpg-error-
 GKPKG_LIBGPG_ERROR_SRCDIR="${GKPKG_LIBGPG_ERROR_SRCDIR:-libgpg-error-${GKPKG_LIBGPG_ERROR_PV}}"
 GKPKG_LIBGPG_ERROR_BINPKG="${GKPKG_LIBGPG_ERROR_BINPKG:-%%CACHE%%/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}-%%ARCH%%.tar.xz}"
 
+GKPKG_LIBXCRYPT_PN="libxcrypt"
+GKPKG_LIBXCRYPT_PV="${GKPKG_LIBXCRYPT_PV:-VERSION_LIBXCRYPT}"
+GKPKG_LIBXCRYPT_DEPS=""
+GKPKG_LIBXCRYPT_SRCTAR="${GKPKG_LIBXCRYPT_SRCTAR:-${DISTDIR}/libxcrypt-${GKPKG_LIBXCRYPT_PV}.tar.gz}"
+GKPKG_LIBXCRYPT_SRCDIR="${GKPKG_LIBXCRYPT_SRCDIR:-libxcrypt-${GKPKG_LIBXCRYPT_PV}}"
+GKPKG_LIBXCRYPT_BINPKG="${GKPKG_LIBXCRYPT_BINPKG:-%%CACHE%%/libxcrypt-${GKPKG_LIBXCRYPT_PV}-%%ARCH%%.tar.xz}"
+
 GKPKG_LVM_PN="lvm"
 GKPKG_LVM_PV="${GKPKG_LVM_PV:-VERSION_LVM}"
 GKPKG_LVM_DEPS="util-linux eudev libaio"

diff --git a/gkbuilds/libxcrypt.gkbuild b/gkbuilds/libxcrypt.gkbuild
new file mode 100644
index 0000000..1834e25
--- /dev/null
+++ b/gkbuilds/libxcrypt.gkbuild
@@ -0,0 +1,17 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+src_prepare() {
+	default
+
+	gkautoreconf
+}
+
+src_configure() {
+	local myopts=(
+		--enable-shared
+		--enable-static
+	)
+
+	gkconf "${myopts[@]}"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/
@ 2020-08-26 22:54 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-08-26 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f492c407747e2c266c71ea9f19193f8fecd3bd8f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 21:33:28 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 21:46:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f492c407

eudev: Enable kmod support

This will allow us to use (e)udev to load required kernel modules.

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

 defaults/software.sh   | 13 ++++++++++---
 gkbuilds/eudev.gkbuild |  4 +---
 gkbuilds/kmod.gkbuild  | 24 +++++++++++++++++++-----
 gkbuilds/xz.gkbuild    | 19 +++++++++++++++++++
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index d8dbfc9..619b026 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -74,7 +74,7 @@ GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPB
 
 GKPKG_EUDEV_PN="eudev"
 GKPKG_EUDEV_PV="${GKPKG_EUDEV_PV:-VERSION_EUDEV}"
-GKPKG_EUDEV_DEPS="util-linux"
+GKPKG_EUDEV_DEPS="util-linux zlib xz kmod"
 GKPKG_EUDEV_SRCTAR="${GKPKG_EUDEV_SRCTAR:-${DISTDIR}/eudev-${GKPKG_EUDEV_PV}.tar.gz}"
 GKPKG_EUDEV_SRCDIR="${GKPKG_EUDEV_SRCDIR:-eudev-${GKPKG_EUDEV_PV}}"
 GKPKG_EUDEV_BINPKG="${GKPKG_EUDEV_BINPKG:-%%CACHE%%/eudev-${GKPKG_EUDEV_PV}-%%ARCH%%.tar.xz}"
@@ -116,7 +116,7 @@ GKPKG_HWIDS_BINPKG="${GKPKG_HWIDS_BINPKG:-%%CACHE%%/hwids-${GKPKG_HWIDS_PV}-%%AR
 
 GKPKG_ISCSI_PN="open-iscsi"
 GKPKG_ISCSI_PV="${GKPKG_ISCSI_PV:-VERSION_ISCSI}"
-GKPKG_ISCSI_DEPS="kmod zlib util-linux"
+GKPKG_ISCSI_DEPS="util-linux zlib xz kmod"
 GKPKG_ISCSI_SRCTAR="${GKPKG_ISCSI_SRCTAR:-${DISTDIR}/open-iscsi-${GKPKG_ISCSI_PV}.tar.gz}"
 GKPKG_ISCSI_SRCDIR="${GKPKG_ISCSI_SRCDIR:-open-iscsi-${GKPKG_ISCSI_PV}}"
 GKPKG_ISCSI_BINPKG="${GKPKG_ISCSI_BINPKG:-%%CACHE%%/iscsi-${GKPKG_ISCSI_PV}-%%ARCH%%.tar.xz}"
@@ -130,7 +130,7 @@ GKPKG_JSON_C_BINPKG="${GKPKG_JSON_C_BINPKG:-%%CACHE%%/json-c-${GKPKG_JSON_C_PV}-
 
 GKPKG_KMOD_PN="kmod"
 GKPKG_KMOD_PV="${GKPKG_KMOD_PV:-VERSION_KMOD}"
-GKPKG_KMOD_DEPS="zlib"
+GKPKG_KMOD_DEPS="zlib xz"
 GKPKG_KMOD_SRCTAR="${GKPKG_KMOD_SRCTAR:-${DISTDIR}/kmod-${GKPKG_KMOD_PV}.tar.xz}"
 GKPKG_KMOD_SRCDIR="${GKPKG_KMOD_SRCDIR:-kmod-${GKPKG_KMOD_PV}}"
 GKPKG_KMOD_BINPKG="${GKPKG_KMOD_BINPKG:-%%CACHE%%/kmod-${GKPKG_KMOD_PV}-%%ARCH%%.tar.xz}"
@@ -219,6 +219,13 @@ GKPKG_XFSPROGS_SRCTAR="${GKPKG_XFSPROGS_SRCTAR:-${DISTDIR}/xfsprogs-${GKPKG_XFSP
 GKPKG_XFSPROGS_SRCDIR="${GKPKG_XFSPROGS_SRCDIR:-xfsprogs-${GKPKG_XFSPROGS_PV}}"
 GKPKG_XFSPROGS_BINPKG="${GKPKG_XFSPROGS_BINPKG:-%%CACHE%%/xfsprogs-${GKPKG_XFSPROGS_PV}-%%ARCH%%.tar.xz}"
 
+GKPKG_XZ_PN="xz"
+GKPKG_XZ_PV="${GKPKG_XZ_PV:-VERSION_XZ}"
+GKPKG_XZ_DEPS=""
+GKPKG_XZ_SRCTAR="${GKPKG_XZ_SRCTAR:-${DISTDIR}/xz-${GKPKG_XZ_PV}.tar.gz}"
+GKPKG_XZ_SRCDIR="${GKPKG_XZ_SRCDIR:-xz-${GKPKG_XZ_PV}}"
+GKPKG_XZ_BINPKG="${GKPKG_XZ_BINPKG:-%%CACHE%%/xz-${GKPKG_XZ_PV}-%%ARCH%%.tar.xz}"
+
 GKPKG_ZLIB_PN="zlib"
 GKPKG_ZLIB_PV="${GKPKG_ZLIB_PV:-VERSION_ZLIB}"
 GKPKG_ZLIB_DEPS=""

diff --git a/gkbuilds/eudev.gkbuild b/gkbuilds/eudev.gkbuild
index 54f2c0d..0677f0e 100644
--- a/gkbuilds/eudev.gkbuild
+++ b/gkbuilds/eudev.gkbuild
@@ -10,11 +10,9 @@ src_configure() {
 		--disable-selinux
 		--disable-rule-generator
 		--disable-hwdb
+		--enable-kmod
 	)
 
-	# Cannot link against static kmod, https://lists.freedesktop.org/archives/systemd-devel/2013-June/011173.html
-	myconf+=( --disable-kmod )
-
 	gkconf "${myconf[@]}"
 }
 

diff --git a/gkbuilds/kmod.gkbuild b/gkbuilds/kmod.gkbuild
index 44a2df3..bf0f355 100644
--- a/gkbuilds/kmod.gkbuild
+++ b/gkbuilds/kmod.gkbuild
@@ -7,16 +7,24 @@ src_prepare() {
 	sed -i \
 		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
 		configure || die "Failed to re-enable static support"
+
+	# List of symbols which are clashing with (e)udev
+	cat <<-EOF >> kmod.syms
+	mkdir_p                 _kmod_mkdir_p
+	mkdir_parents           _kmod_mkdir_parents
+	path_is_absolute        _kmod_path_is_absolute
+	path_make_absolute_cwd  _kmod_path_make_absolute_cwd
+	EOF
 }
 
 src_configure() {
 	local myconf=(
-		--without-xz
-		--with-zlib
-		--without-openssl
+		--enable-static
 		--disable-python
 		--disable-tools
-		--enable-static
+		--with-xz
+		--with-zlib
+		--without-openssl
 	)
 
 	gkconf "${myconf[@]}"
@@ -27,10 +35,16 @@ src_install() {
 
 	# remove hardcoded $BROOT
 	sed -i \
-		-e 's/-L\/[^ ]*/-L${libdir}/' \
+		-e 's/-L\/[^ ]*/-L${libdir}/g' \
 		"${D}"/usr/lib*/pkgconfig/*.pc \
 		|| die
 
+	# rename internal symbols to avoid clashing with (e)udev
+	$(tc-getOBJCOPY) \
+		--redefine-syms=kmod.syms \
+		"${D}"/usr/lib*/libkmod.a \
+		|| die
+
 	rm -rf \
 		"${D}"/usr/share/
 }

diff --git a/gkbuilds/xz.gkbuild b/gkbuilds/xz.gkbuild
new file mode 100644
index 0000000..8d2e6f5
--- /dev/null
+++ b/gkbuilds/xz.gkbuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+src_configure() {
+	local myconf=(
+		--enable-threads
+		--enable-static
+		--disable-nls
+		--disable-xz
+		--disable-xzdec
+		--disable-lzmadec
+		--disable-lzmainfo
+		--disable-lzma-links
+		--disable-scripts
+		--disable-doc
+	)
+
+	gkconf "${myconf[@]}"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/
@ 2020-07-23 23:57 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-07-23 23:57 UTC (permalink / raw
  To: gentoo-commits

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
 	)
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/
@ 2020-07-23 23:57 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2020-07-23 23:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f6f9384b423e9bb9b8cee294f4ddbeee7c518463
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 20:36:13 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=f6f9384b

mdadm: Switch to UDEV usage

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

 defaults/initrd.scripts | 38 --------------------------------------
 defaults/linuxrc        |  3 ---
 defaults/software.sh    |  2 +-
 defaults/unlock-luks.sh |  1 -
 gkbuilds/mdadm.gkbuild  |  3 +++
 5 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 9b2b32c..5515f49 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1525,24 +1525,6 @@ start_volumes() {
 		run ln -sf /dev/device-mapper /dev/mapper/control
 	fi
 
-	if [ "${USE_MDADM}" = '1' ]
-	then
-		if [ -x '/sbin/mdadm' ]
-		then
-			local mdadm_cmd="run /sbin/mdadm --assemble --scan 2>&1"
-			is_log_enabled && mdadm_cmd="${mdadm_cmd} | tee -a '${GK_INIT_LOG}'"
-			eval "${mdadm_cmd}"
-
-			#Intel Matrix RAID (and possibly others) have a container layer above the actual volumes,
-			#So we have to look for volumes that haven't been activated.
-			mdadm_cmd="run /sbin/mdadm -IRs 2>&1"
-			is_log_enabled && mdadm_cmd="${mdadm_cmd} | tee -a '${GK_INIT_LOG}'"
-			eval "${mdadm_cmd}"
-		else
-			bad_msg "domdadm invoked but /sbin/mdadm not found; Skipping mdadm raid assembly ..."
-		fi
-	fi
-
 	if [ "${USE_MULTIPATH_NORMAL}" = '1' ]
 	then
 		for multipath_path in /sbin/multipath /bin/multipath MISSING
@@ -1887,7 +1869,6 @@ openLUKS() {
 				continue
 			fi
 
-			setup_md_device ${LUKS_DEVICE}
 			if ! run cryptsetup isLuks ${LUKS_DEVICE}
 			then
 				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
@@ -2571,25 +2552,6 @@ setup_btrfsctl() {
 	fi
 }
 
-setup_md_device() {
-	local device
-
-	[ -z "$1" ] && device="${REAL_ROOT}" || device="$1"
-	[ -z "${device}" ] && return # LiveCD
-
-	if [ $(echo ${device}|sed -e 's#\(luks:\)\?\(/dev/md\)[[:digit:]]\+#\2#') = "/dev/md" ]
-	then
-		good_msg 'Detected real_root as a md device. Setting up the device node ...'
-		MD_NUMBER=$(echo ${device}|sed -e 's#\(luks:\)\?/dev/md\([[:digit:]]\+\)#\2#')
-		if [ ! -e /dev/md${MD_NUMBER} ]
-		then
-			run mknod /dev/md${MD_NUMBER} b 9 ${MD_NUMBER} >/dev/null 2>&1
-			[ $? -ne 0 ] && bad_msg "Creation of /dev/md${MD_NUMBER} failed ..."
-		fi
-		run raidautorun /dev/md${MD_NUMBER}
-	fi
-}
-
 rundebugshell() {
 	if is_debug
 	then

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 210085a..4c1b470 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -625,9 +625,6 @@ sdelay
 # Setup btrfs, see bug 303529
 setup_btrfsctl
 
-# Setup md device nodes if they dont exist
-setup_md_device
-
 # Scan volumes
 start_volumes
 

diff --git a/defaults/software.sh b/defaults/software.sh
index 463d8cf..3de9470 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -165,7 +165,7 @@ GKPKG_LZO_BINPKG="${GKPKG_LZO_BINPKG:-%%CACHE%%/lzo-${GKPKG_LZO_PV}-%%ARCH%%.tar
 
 GKPKG_MDADM_PN="mdadm"
 GKPKG_MDADM_PV="${GKPKG_MDADM_PV:-VERSION_MDADM}"
-GKPKG_MDADM_DEPS=""
+GKPKG_MDADM_DEPS="eudev"
 GKPKG_MDADM_SRCTAR="${GKPKG_MDADM_SRCTAR:-${DISTDIR}/mdadm-${GKPKG_MDADM_PV}.tar.xz}"
 GKPKG_MDADM_SRCDIR="${GKPKG_MDADM_SRCDIR:-mdadm-${GKPKG_MDADM_PV}}"
 GKPKG_MDADM_BINPKG="${GKPKG_MDADM_BINPKG:-%%CACHE%%/mdadm-${GKPKG_MDADM_PV}-%%ARCH%%.tar.xz}"

diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 87381ab..710d951 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -63,7 +63,6 @@ main() {
 				exit 1
 			fi
 
-			setup_md_device "${LUKS_DEVICE}"
 			if ! run cryptsetup isLuks "${LUKS_DEVICE}"
 			then
 				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" "${CRYPT_SILENT}"

diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild
index 2307d0e..b43f753 100644
--- a/gkbuilds/mdadm.gkbuild
+++ b/gkbuilds/mdadm.gkbuild
@@ -10,6 +10,7 @@ src_prepare() {
 		-e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = ${CFLAGS} ${defs}:" \
 		-e "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" \
 		-e "s/^# LDFLAGS = -static/LDFLAGS = -static/" \
+		-e "s|^UDEVDIR := .*|UDEVDIR = $(get_udevdir)|" \
 		Makefile \
 		|| die "Failed to sed mdadm Makefile"
 }
@@ -19,6 +20,8 @@ src_compile() {
 }
 
 src_install() {
+	gkmake V=1 DESTDIR="${D}" install-udev
+
 	mkdir -p "${D}"/sbin || die "Failed to create '${D}/sbin'!"
 
 	cp -a mdadm "${D}"/sbin/ \


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-27 10:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-13 15:42 [gentoo-commits] proj/genkernel:master commit in: defaults/, gkbuilds/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2023-07-27 10:42 Sam James
2021-07-06  0:25 Thomas Deutschmann
2020-08-26 22:54 Thomas Deutschmann
2020-07-23 23:57 Thomas Deutschmann
2020-07-23 23:57 Thomas Deutschmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox