sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update locales for Centos 8

Browse Source 
CentOS 8 has the "new" split-up locales packages.  Fedora 24 is now
long gone, so take out the old branch and apply the lang package
install to Centos 8 as well.

The manual locale cleanup is not necessary on Centos 8; skip it.

Change-Id: Ib65fc15fe471348793fd6efb034517f11abd905e
This commit is contained in:
Ian Wienand 2019-09-25 01:30:12 +00:00
parent 0e230642c5
commit 1176a45525
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup
View File

@ -23,9 +23,9 @@ set -o pipefail
# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target" # effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
# This is only required on CentOS ... see notes in # This is only required on CentOS7 ... see notes in
# root.d/08-yum-chroot about %_install_langs # root.d/08-yum-chroot about %_install_langs
if [[ $DISTRO_NAME != "fedora" ]]; then if [[ $DISTRO_NAME == "centos" && $DIB_RELEASE == "7" ]]; then
# Stripping *all* locales is a bad idea. For now, we take the # Stripping *all* locales is a bad idea. For now, we take the
# suggestion in [1] for reducing this # suggestion in [1] for reducing this

31
diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
View File

@ -183,28 +183,15 @@ function _install_pkg_manager {
local _lang_pack="" local _lang_pack=""
local _extra_pkgs="" local _extra_pkgs=""
if [ $DISTRO_NAME = "fedora" -a $DIB_RELEASE -le 23 ]; then if [[ $DISTRO_NAME == "fedora" ]] || \
# _install_langs is a rpm macro that limits the translation [[ $DISTRO_NAME == "centos" && $DIB_RELEASE -ge 8 ]]; then
# files, etc installed by packages. For Fedora 23 [1], the # glibc from F24 onwards has split locales into "langpack"
# glibc-common package will obey this to only install the # packages. Host yum doesn't understand the
# listed locales, keeping things much smaller (we still have # weak-dependencies glibc now uses to get the
# to clean up locales manually on centos7). We install just # minimal-langpack and chooses a random(ish) one that
# en_US because people often ssh in with that locale, but # satisfies the locale dependency (rhbz#1349258).
# leave out everything else. Note that yum has an option to # Work-around this by explicitly requring the minimal and
# set this from the command-line [2], but the yum in trusty we # english (for en_US.UTF-8) pack.
# are using is too old to have it. So we set it directly in
# the macros file
#
# [1] http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/commit/glibc.spec?h=f23&id=91764bd9ec690d4b8a886c0a3a104aac12d340d2
# [2] http://yum.baseurl.org/gitweb?p=yum.git;a=commit;h=26128173b362474456e8f0642073ecb0322ed031
echo "%_install_langs C:en_US:en_US.UTF-8" >> $HOME/.rpmmacros
elif [ $DISTRO_NAME = "fedora" -a $DIB_RELEASE -ge 24 ]; then
# glibc on F24 has split locales into "langpack" packages.
# Yum doesn't understand the weak-dependencies glibc now
# uses to get the minimal-langpack and chooses a
# random(ish) one that satisfies the locale dependency
# (rhbz#1349258). Work-around this by explicitly requring
# the minimal and english (for en_US.UTF-8) pack.
_lang_pack="glibc-minimal-langpack glibc-langpack-en" _lang_pack="glibc-minimal-langpack glibc-langpack-en"
fi fi