teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps-src: force glibc locale generation on musl hosts. 

localedef is only available with glibc, so that defer locale creation
once the chroot is ready.

This fixes installing bootstrap glibc pkgs on musl hosts.
This commit is contained in:
Juan RP 2015-12-12 07:35:30 +01:00
parent c38816c595
commit c9dede4e23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/xbps-src/shutils/chroot.sh
View File

@ -98,7 +98,6 @@ chroot_prepare() {
# Prepare default locale: en_US.UTF-8. # Prepare default locale: en_US.UTF-8.
if [ -z "$XBPS_TEMP_MASTERDIR" -a -s ${XBPS_MASTERDIR}/etc/default/libc-locales ]; then if [ -z "$XBPS_TEMP_MASTERDIR" -a -s ${XBPS_MASTERDIR}/etc/default/libc-locales ]; then
echo 'en_US.UTF-8 UTF-8' >> ${XBPS_MASTERDIR}/etc/default/libc-locales echo 'en_US.UTF-8 UTF-8' >> ${XBPS_MASTERDIR}/etc/default/libc-locales
$XBPS_RECONFIGURE_CMD -f glibc-locales
fi fi
touch -f $XBPS_MASTERDIR/.xbps_chroot_init touch -f $XBPS_MASTERDIR/.xbps_chroot_init

2
xbps-src
View File

@ -303,7 +303,7 @@ install_bbootstrap() {
reconfigure_bootstrap_pkgs() { reconfigure_bootstrap_pkgs() {
local statefile="$XBPS_MASTERDIR/.xbps_chroot_configured" local statefile="$XBPS_MASTERDIR/.xbps_chroot_configured"
local pkgs="ca-certificates" local pkgs="glibc-locales ca-certificates"
[ -z "$IN_CHROOT" -o -e $statefile ] && return 0 [ -z "$IN_CHROOT" -o -e $statefile ] && return 0
# Reconfigure ca-certificates. # Reconfigure ca-certificates.
msg_normal "Reconfiguring bootstrap packages...\n" msg_normal "Reconfiguring bootstrap packages...\n"