glibc: fixed locale support by adding on-target locale archive generation

Author: hsteinhaus

packages/devel/glibc/package.mk

@@ -141,10 +141,17 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share/i18n/charmaps
 
   if [ ! "$GLIBC_LOCALES" = yes ]; then
+    # remove locales and charmaps
+    rm -rf $INSTALL/usr/share/i18n/charmaps
     rm -rf $INSTALL/usr/share/i18n/locales
 
     mkdir -p $INSTALL/usr/share/i18n/locales
-      cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+    cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+    cp -PR $ROOT/$PKG_BUILD/localedata/locales/* $INSTALL/usr/share/i18n/locales
+  else
+    # prepare locale environment, actual archive generation has to be done on target 
+    cp $PKG_DIR/scripts/locale-gen-archive $INSTALL/usr/bin
+    ln -s /storage/.config/locale $INSTALL/usr/lib/
   fi
 
 # create default configs
@@ -178,3 +185,9 @@ makeinstall_init() {
       ln -sf ld.so $INSTALL/lib/ld-linux.so.3
     fi
 }
+
+post_install() {
+  if [ "$GLIBC_LOCALES" = yes ]; then
+    enable_service locale.service
+  fi
+}

packages/devel/glibc/scripts/locale-gen-archive

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# generate locale archive containing for some common languages
+# TODO: make configurable
+mkdir -p /storage/.config/locale
+echo "This directory contains the locale archive, please do not delete" > /storage/.config/locale/README
+
+localedef --prefix=$INSTALL -v -c -i de_DE -f UTF-8 de_DE.UTF-8
+localedef --prefix=$INSTALL -v -c -i en_US -f UTF-8 en_US.UTF-8
+localedef --prefix=$INSTALL -v -c -i es_ES -f UTF-8 es_ES.UTF-8
+localedef --prefix=$INSTALL -v -c -i fr_FR -f UTF-8 fr_FR.UTF-8
+localedef --prefix=$INSTALL -v -c -i ru_RU -f UTF-8 ru_RU.UTF-8

packages/devel/glibc/system.d/locale.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Generate locale archive if not already there
+DefaultDependencies=no
+ConditionPathExists=!/storage/.config/locale/locale-archive
+After=userconfig.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c "/usr/bin/locale-gen-archive &> /dev/null"
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target