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 8F8EF138334 for ; Sat, 14 Dec 2019 00:26:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1574E089F; Sat, 14 Dec 2019 00:26:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A38B0E089F for ; Sat, 14 Dec 2019 00:26:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9CC734D97F for ; Sat, 14 Dec 2019 00:26:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67AF8902 for ; Sat, 14 Dec 2019 00:26: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: <1576282011.df8eaed4da4f2c84671c46ddf8ba12c3070dd08a.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: df8eaed4da4f2c84671c46ddf8ba12c3070dd08a X-VCS-Branch: master Date: Sat, 14 Dec 2019 00:26: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: 45587fa8-8b72-43d6-bab2-a158e111d3e6 X-Archives-Hash: a991395db7b9a33042e01b731f25fbac commit: df8eaed4da4f2c84671c46ddf8ba12c3070dd08a Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Dec 13 22:37:03 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Dec 14 00:06:51 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=df8eaed4 gen_initramfs.sh: append_busybox(): Only include libnss_dns.so on glibc based CHOST libnss_dns.so is for example not available on musl. Signed-off-by: Thomas Deutschmann gentoo.org> gen_initramfs.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index ab7b151..4ecdef5 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -459,9 +459,12 @@ append_busybox() { done # allow for DNS resolution - local libdir=$(get_chost_libdir) - mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!" - copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so + 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_dns.so + fi log_future_cpio_content find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \