From d523e6c26cab6820fa2a6d76ce74862c3311db97 Mon Sep 17 00:00:00 2001 From: Olli Salonen Date: Wed, 19 Oct 2016 19:35:03 +0300 Subject: [PATCH] glibc: only add UTF-8 charmap for Generic project Installer needs a proper charmap. Only Generic project utilizes the installer. --- packages/devel/glibc/package.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 37546714d6..30ff9757b6 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -136,11 +136,15 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/lib/*.map rm -rf $INSTALL/var -# remove locales and charmaps (except UTF-8 for installer) +# remove locales and charmaps rm -rf $INSTALL/usr/share/i18n/charmaps - mkdir -p $INSTALL/usr/share/i18n/charmaps - cp -PR $ROOT/$PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps - gzip $INSTALL/usr/share/i18n/charmaps/UTF-8 + +# add UTF-8 charmap for Generic (charmap is needed for installer) + if [ "$PROJECT" = "Generic" ]; then + mkdir -p $INSTALL/usr/share/i18n/charmaps + cp -PR $ROOT/$PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps + gzip $INSTALL/usr/share/i18n/charmaps/UTF-8 + fi if [ ! "$GLIBC_LOCALES" = yes ]; then rm -rf $INSTALL/usr/share/i18n/locales