From 6c96173f61d4091a869657df2202fd3d9654ca63 Mon Sep 17 00:00:00 2001
From: thoradia <thoradia.quack@gmail.com>
Date: Fri, 29 Sep 2017 08:17:49 +0200
Subject: [PATCH] locale: include localedef

---
 packages/addons/service/locale/changelog.txt     | 3 +++
 packages/addons/service/locale/package.mk        | 6 +++++-
 packages/addons/service/locale/source/default.py | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/locale/changelog.txt b/packages/addons/service/locale/changelog.txt
index 6c3e832395..e447f8e84f 100644
--- a/packages/addons/service/locale/changelog.txt
+++ b/packages/addons/service/locale/changelog.txt
@@ -1,3 +1,6 @@
+102:
+- Include localedef
+
 101:
 - Fix dialog message
 
diff --git a/packages/addons/service/locale/package.mk b/packages/addons/service/locale/package.mk
index 3d415fbecd..d78e2d54fc 100644
--- a/packages/addons/service/locale/package.mk
+++ b/packages/addons/service/locale/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="locale"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_DEPENDS_TARGET="toolchain glibc"
 PKG_SECTION="service"
@@ -37,6 +37,10 @@ makeinstall_target() {
 }
 
 addon() {
+  mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+  cp -PR "$(get_build_dir glibc)/.$TARGET_NAME/locale/localedef" \
+         "$ADDON_BUILD/$PKG_ADDON_ID/bin"
+
   mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
   cp -PR "$(get_build_dir glibc)/localedata/charmaps" \
          "$(get_build_dir glibc)/localedata/locales" \
diff --git a/packages/addons/service/locale/source/default.py b/packages/addons/service/locale/source/default.py
index dbee50e922..3408bc1e4e 100644
--- a/packages/addons/service/locale/source/default.py
+++ b/packages/addons/service/locale/source/default.py
@@ -53,7 +53,8 @@ class Monitor(xbmc.Monitor):
 
       if os.path.isdir(localepath) == False:
          os.environ['I18NPATH'] = i18npath
-         subprocess.call(['localedef', '-f', charmap, '-i', locale, localepath])
+         subprocess.call([os.path.join(path, 'bin/localedef'), '-f', charmap,
+                         '-i', locale, localepath])
 
       if os.path.isdir(profiled) == False:
          os.makedirs(profiled)