From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1105124-garchives=archives.gentoo.org@lists.gentoo.org>
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 1D1E8138334
for <garchives@archives.gentoo.org>; Sun, 11 Aug 2019 19:55:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5C240E083E;
Sun, 11 Aug 2019 19:55:40 +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 16B97E083E
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Aug 2019 19:55:39 +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 ED5993498E7
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Aug 2019 19:55:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AA7AA751
for <gentoo-commits@lists.gentoo.org>; Sun, 11 Aug 2019 19:55:36 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
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" <whissi@gentoo.org>
Message-ID: <1565552908.9de72e7d230f7ad8822825ad204136233af95f47.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: 9de72e7d230f7ad8822825ad204136233af95f47
X-VCS-Branch: master
Date: Sun, 11 Aug 2019 19:55:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 74463d70-8aa0-409b-9fb4-02ef48b73c94
X-Archives-Hash: 1f6aeac4d97a72e218be39d9128d25ab
commit: 9de72e7d230f7ad8822825ad204136233af95f47
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 19:15:07 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 19:48:28 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9de72e7d
gen_initramfs.sh: create_initramfs(): Change /etc/ld.so.cache creation
- Always generate or update /etc/ld.so.cache when possible.
- ldconfig will chroot due to "-r" parameter. Therefore, "-f" parameter
expects 'relative' path from chrooted root.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_initramfs.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 36b4678..c5e4a67 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -1603,12 +1603,12 @@ create_initramfs() {
"${CPIO_COMMAND}" --quiet -i -F "${CPIO_ARCHIVE}" 2>/dev/null \
|| gen_die "Failed to extract cpio '${CPIO_ARCHIVE}' for dedupe"
- if [ -e etc/ld.so.cache ] && ! isTrue "$(tc-is-cross-compiler)"
+ if ! isTrue "$(tc-is-cross-compiler)"
then
- # We can update /etc/ld.so.cache which was copied from host
+ # We can generate or update /etc/ld.so.cache which was copied from host
# to actually match initramfs' content.
print_info 1 "$(get_indent 1)>> Pre-generating initramfs' /etc/ld.so.cache ..."
- ldconfig -f "${TDIR}/etc/ld.so.conf" -r . 2>/dev/null \
+ ldconfig -f /etc/ld.so.conf -r "${TDIR}" 2>/dev/null \
|| gen_die "Failed to pre-generate '${TDIR}/etc/ld.so.cache'!"
fi