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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0691A158086 for ; Mon, 15 Nov 2021 03:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA6FFE08BD; Mon, 15 Nov 2021 03:35:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79B06E089C for ; Mon, 15 Nov 2021 03:35:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07A03342AEB for ; Mon, 15 Nov 2021 03:35:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3735F1C6 for ; Mon, 15 Nov 2021 03:35:07 +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: <1636939477.fb2a687bba457e5408bc3bd979568c9a18c51be5.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: fb2a687bba457e5408bc3bd979568c9a18c51be5 X-VCS-Branch: master Date: Mon, 15 Nov 2021 03:35:07 +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: 136a88c5-ebf9-4a53-abdf-76f286e156f2 X-Archives-Hash: 5440805761e93c71919719f32904e5ad commit: fb2a687bba457e5408bc3bd979568c9a18c51be5 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Nov 14 23:57:58 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Nov 15 01:24:37 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fb2a687b gen_initramfs.sh: append_dropbear: NSS files module was merged into libc in >=glibc-2.34 Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index fef8046..4ec296e 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1601,8 +1601,16 @@ append_dropbear() { if isTrue "$(is_glibc)" then local libdir=$(get_chost_libdir) - mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!" - copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_files.so + local libnss_files="${libdir}/libnss_files.so" + + # NSS files module was moved into libc in >=glibc-2.34 + # but when this file exists we are probably dealing with older glibc + # and need to manually copy the module. + if [[ -f "${libnss_files}" ]] + then + mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!" + copy_system_binaries "${TDIR}"/lib "${libnss_files}" + fi fi cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"