[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

[Thomas Deutschmann]

commit:     e0515e9e35f1a9c0ec7e5fb6daf6124a9b2054ef
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 29 20:40:05 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 29 20:44:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0515e9e

sys-kernel/genkernel: fix building dropbear

dropbear needs libxcrypt.

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../genkernel-4.2.4-fix-dropbear-depend.patch      | 26 ++++++++++++++++++++++
 ...rnel-4.2.4.ebuild => genkernel-4.2.4-r1.ebuild} |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
new file mode 100644
index 00000000000..ab74620e0fa
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
@@ -0,0 +1,26 @@
+From e43878aa62e563fcefa7c1da5c44017816ac65b4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@g.o>
+Date: Wed, 29 Sep 2021 20:15:56 +0200
+Subject: defaults/software.sh: dropbear needs libxcrypt
+
+Signed-off-by: Thomas Deutschmann <whissi@g.o>
+---
+ defaults/software.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 54836ad..9f64ab0 100644
+--- a/defaults/software.sh
++++ b/defaults/software.sh
+@@ -67,7 +67,7 @@ GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-
+ 
+ GKPKG_DROPBEAR_PN="dropbear"
+ GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
+-GKPKG_DROPBEAR_DEPS="zlib"
++GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
+ GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
+ GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
+ GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"
+-- 
+cgit v1.2.3-18-g5258
+

diff --git a/sys-kernel/genkernel/genkernel-4.2.4.ebuild b/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.2.4.ebuild
rename to sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
index a7c583a33ed..f8f6847a650 100644
--- a/sys-kernel/genkernel/genkernel-4.2.4.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
@@ -125,6 +125,8 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-fix-dropbear-depend.patch )
+
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack