diff --git a/configure b/configure index 8a72258..5f93bf7 100755 --- a/configure +++ b/configure @@ -1595,6 +1595,7 @@ USE_PORTAGE_TESTING=${USE_PORTAGE_TESTING@Q} SELECT_MIRRORS=${SELECT_MIRRORS@Q} SELECT_MIRRORS_LARGE_FILE=${SELECT_MIRRORS_LARGE_FILE@Q} SYSTEMD=\$([[ \$STAGE3_VARIANT == *systemd* ]] && echo "true" || echo "false") +MUSL=\$([[ \$STAGE3_VARIANT == *musl* ]] && echo "true" || echo "false") ################################################ diff --git a/gentoo.conf.example b/gentoo.conf.example index bc5fc0b..0e798c7 100644 --- a/gentoo.conf.example +++ b/gentoo.conf.example @@ -248,6 +248,8 @@ STAGE3_BASENAME="stage3-$GENTOO_ARCH-$STAGE3_VARIANT" # Automatically set to true, if the stage3 tarball is based on systemd. In this case # we need to use slightly different utilities to setup the base system. SYSTEMD=$([[ $STAGE3_VARIANT == *systemd* ]] && echo "true" || echo "false") +# Automatically set to true, if the stage3 tarball is based on musl. +MUSL=$([[ $STAGE3_VARIANT == *musl* ]] && echo "true" || echo "false") # If set to true, the installer will add ACCEPT_KEYWORDS="~$GENTOO_ARCH" # to /etc/portage/make.conf to enable packages in testing. diff --git a/scripts/main.sh b/scripts/main.sh index 709bf2e..0c98b4e 100644 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -13,11 +13,16 @@ function install_stage3() { } function configure_base_system() { - einfo "Generating locales" - echo "$LOCALES" > /etc/locale.gen \ - || die "Could not write /etc/locale.gen" - locale-gen \ - || die "Could not generate locales" + if [[ $MUSL == "true" ]]; then + einfo "Installing musl-locales" + try emerge --verbose sys-apps/musl-locales + else + einfo "Generating locales" + echo "$LOCALES" > /etc/locale.gen \ + || die "Could not write /etc/locale.gen" + locale-gen \ + || die "Could not generate locales" + fi if [[ $SYSTEMD == "true" ]]; then einfo "Setting machine-id"