From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BA57158017 for ; Wed, 29 Sep 2021 20:44:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B73BEE08CD; Wed, 29 Sep 2021 20:44:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F40BE08CD for ; Wed, 29 Sep 2021 20:44:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9725B342CFA for ; Wed, 29 Sep 2021 20:44:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0D5BE5 for ; Wed, 29 Sep 2021 20:44:49 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1632948276.e0515e9e35f1a9c0ec7e5fb6daf6124a9b2054ef.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild sys-kernel/genkernel/genkernel-4.2.4.ebuild X-VCS-Directories: sys-kernel/genkernel/ sys-kernel/genkernel/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: e0515e9e35f1a9c0ec7e5fb6daf6124a9b2054ef X-VCS-Branch: master Date: Wed, 29 Sep 2021 20:44:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 68020e68-b80a-4573-8e84-5e20a2fa3826 X-Archives-Hash: 3ef1aa5523f0e46dff6d563617b71c9e commit: e0515e9e35f1a9c0ec7e5fb6daf6124a9b2054ef Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 29 20:40:05 2021 +0000 Commit: Thomas Deutschmann gentoo 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 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 +Date: Wed, 29 Sep 2021 20:15:56 +0200 +Subject: defaults/software.sh: dropbear needs libxcrypt + +Signed-off-by: Thomas Deutschmann +--- + 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