public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 4/8] targets: Test for locale-gen
Date: Thu, 14 May 2020 23:09:57 -0700	[thread overview]
Message-ID: <20200515061001.2581484-4-mattst88@gentoo.org> (raw)
In-Reply-To: <20200515061001.2581484-1-mattst88@gentoo.org>

locale-gen is only provided by glibc and not by others.

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 targets/stage1/chroot.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index ac9d68ea..b48fda65 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -82,7 +82,9 @@ run_merge "--oneshot ${clst_buildpkgs}"
 # locale-gen does not support the ROOT variable, and as such glibc simply does
 # not run locale-gen when ROOT is set. Since we've set LANG, we need to run
 # locale-gen explicitly.
-locale-gen --destdir "${clst_root_path}"/ || die "locale-gen failed"
+if [ -x "$(command -v locale-gen)" ]; then
+	locale-gen --destdir "${clst_root_path}"/ || die "locale-gen failed"
+fi
 
 # Why are we removing these? Don't we need them for final make.conf?
 for useexpand in ${clst_HOSTUSEEXPAND}; do
-- 
2.26.2



  parent reply	other threads:[~2020-05-15  6:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15  6:09 [gentoo-catalyst] [PATCH 1/8] doc: Remove extra asterisk Matt Turner
2020-05-15  6:09 ` [gentoo-catalyst] [PATCH 2/8] doc: Drop pre-EAPI-5 text Matt Turner
2020-05-15  6:09 ` [gentoo-catalyst] [PATCH 3/8] doc: Merge SUPPORTED HASHES section into digests section Matt Turner
2020-05-15  6:09 ` Matt Turner [this message]
2020-05-15  6:09 ` [gentoo-catalyst] [PATCH 5/8] catalyst: Drop unnecessary clear_path() Matt Turner
2020-05-15  6:09 ` [gentoo-catalyst] [PATCH 6/8] catalyst: Add error checking to snapshot target Matt Turner
2020-05-15  6:10 ` [gentoo-catalyst] [PATCH 7/8] catalyst: Make parent directories of snapshots/ Matt Turner
2020-05-15  6:10 ` [gentoo-catalyst] [PATCH 8/8] catalyst: Explain the git gc config options Matt Turner
2020-05-16  1:51 ` [gentoo-catalyst] [PATCH 1/8] doc: Remove extra asterisk Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200515061001.2581484-4-mattst88@gentoo.org \
    --to=mattst88@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox