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 7A381138350 for ; Mon, 30 Mar 2020 03:26:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D333E0872; Mon, 30 Mar 2020 03:26:57 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (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 8A01EE0872 for ; Mon, 30 Mar 2020 03:26:57 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id e1so6177650plt.9 for ; Sun, 29 Mar 2020 20:26:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DM8Cao5sBNTy3U92vSZpBmmYIu4BHH6D7C70Nh4+X6s=; b=g6SQNWZoAzLhsuJaWuO2+HOLsQKEeqqz5sQMBkyxbrQFHUm7X0gpx6vu7IwC1rXzBE sHitEGQXcghZZCe1pieXahYhKzPw4fGmjfbA+3A1W0lcpBNxdxRWC4/RZ4svnHhbY5kG b+qt1MewQDq7corStzFn00QSunf6kqVKETxlZqlIUBYibE0l3KMSFG8G3lh3bwbGo1vd H8o5GxYGUKMvdzFXuJoUd1BAIFbyrw6l2vNhgg/nPGKE4xYnlNOOGgg7k2/1kRkxtL5U 4qDSb95/X8gSvS3HldTf7gZFNxdjVtq5J2CG7s6bKzDyiYrafEfRGzwHrhBcOjgFDtYV Z77w== X-Gm-Message-State: ANhLgQ18HTBj4+Etku90uKzUQ5I4x1F/KJAkxkx59ImmnogItMxUUgRw Jbh+oUPQf+zSC+wHpzDG+3x2EdMHcGE= X-Google-Smtp-Source: ADFU+vs8E/SxXr9LxvgFMEHPf2M5wIsHq/eZAlPUTyxs+bGEbs4k/Rf6XCVKLYbqPtV4ffoCHXlfaw== X-Received: by 2002:a17:902:a582:: with SMTP id az2mr10981903plb.222.1585538816062; Sun, 29 Mar 2020 20:26:56 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id b189sm9090680pfa.209.2020.03.29.20.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 20:26:55 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 1/2] targets: Set LANG=C.UTF8 Date: Sun, 29 Mar 2020 20:26:43 -0700 Message-Id: <20200330032644.3086274-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.24.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 46f82e49-39cd-4980-9747-4e820682cbb9 X-Archives-Hash: 5fa7bd09ac90d8c854fef84443a0ab92 Stable glibc now always provides a UTF-8 capable locale, which many packages require. Set this as the default LANG. Running locale-gen in stage1 should also solve bug #536938. Bug: https://bugs.gentoo.org/536938 Bug: https://bugs.gentoo.org/710762 Bug: https://bugs.gentoo.org/714906 Signed-off-by: Matt Turner --- targets/stage1/chroot.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index 0caf49ee..88a36481 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -57,6 +57,11 @@ make_destpath /tmp/stage1root run_merge "--oneshot --nodeps sys-apps/baselayout" ${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} +for etc in /etc /tmp/stage1root/etc; do + echo "LANG=C.UTF8" > ${etc}/env.d/02locale +done +update_env_settings + # Now, we install our packages if [ -e ${clst_make_conf} ]; then echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf} @@ -71,6 +76,13 @@ fi run_merge "--oneshot ${clst_buildpkgs}" +# TODO: Drop this when locale-gen in stable glibc supports ROOT. +# +# 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 /tmp/stage1root/ + # Why are we removing these? Don't we need them for final make.conf? for useexpand in ${clst_HOSTUSEEXPAND}; do x="clst_${useexpand}" -- 2.24.1