Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Sat, 14 Dec 2019 00:26:56
Message-Id: 1576282011.df8eaed4da4f2c84671c46ddf8ba12c3070dd08a.whissi@gentoo
1 commit: df8eaed4da4f2c84671c46ddf8ba12c3070dd08a
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 13 22:37:03 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 14 00:06:51 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=df8eaed4
7
8 gen_initramfs.sh: append_busybox(): Only include libnss_dns.so on glibc based CHOST
9
10 libnss_dns.so is for example not available on musl.
11
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 gen_initramfs.sh | 9 ++++++---
15 1 file changed, 6 insertions(+), 3 deletions(-)
16
17 diff --git a/gen_initramfs.sh b/gen_initramfs.sh
18 index ab7b151..4ecdef5 100755
19 --- a/gen_initramfs.sh
20 +++ b/gen_initramfs.sh
21 @@ -459,9 +459,12 @@ append_busybox() {
22 done
23
24 # allow for DNS resolution
25 - local libdir=$(get_chost_libdir)
26 - mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
27 - copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so
28 + if isTrue "$(is_glibc)"
29 + then
30 + local libdir=$(get_chost_libdir)
31 + mkdir -p "${TDIR}"/lib || gen_die "Failed to create '${TDIR}/lib'!"
32 + copy_system_binaries "${TDIR}"/lib "${libdir}"/libnss_dns.so
33 + fi
34
35 log_future_cpio_content
36 find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F "${CPIO_ARCHIVE}" \