Enable translations for petitboot
This change adds translations for petitboot. We already have the message
catalogues for a bunch of languages, so enable building these into the
final image.
We enable these for firestone and habanero, but there's no reason we
couldn't do this for other languages too.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 3324aef..99cc70d 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -35,8 +35,8 @@
# petitboot requirements
BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
+BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
BR2_ROOTFS_OVERLAY="../openpower/overlay"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 5c8169a..1773cd9 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -35,8 +35,8 @@
# petitboot requirements
BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
+BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
BR2_ROOTFS_OVERLAY="../openpower/overlay"
diff --git a/openpower/overlay/etc/locale b/openpower/overlay/etc/locale
index 6556836..6737e87 100644
--- a/openpower/overlay/etc/locale
+++ b/openpower/overlay/etc/locale
@@ -1 +1 @@
-LANG=en_US.utf-8
+LANG=en_US.utf8
diff --git a/openpower/package/petitboot/S15pb-discover b/openpower/package/petitboot/S15pb-discover
index 58472ba..8f9638c 100755
--- a/openpower/package/petitboot/S15pb-discover
+++ b/openpower/package/petitboot/S15pb-discover
@@ -16,6 +16,7 @@
start)
ulimit -c unlimited
mkdir -p $(dirname $LOGFILE)
+ export $(cat /etc/locale)
pb-discover -l $LOGFILE $verbose &
echo $! > $PIDFILE
;;
diff --git a/openpower/package/petitboot/petitboot.mk b/openpower/package/petitboot/petitboot.mk
index 196a732..c586874 100644
--- a/openpower/package/petitboot/petitboot.mk
+++ b/openpower/package/petitboot/petitboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PETITBOOT_VERSION = 5acb43464206348b7cced9508852fdd2989aea58
+PETITBOOT_VERSION = 804a112a34aed2d20021f7ae1750d8545bb0149e
PETITBOOT_SITE = git://github.com/open-power/petitboot.git
PETITBOOT_DEPENDENCIES = ncurses udev host-bison host-flex lvm2
PETITBOOT_LICENSE = GPLv2
@@ -55,6 +55,8 @@
ln -sf /usr/sbin/pb-udhcpc \
$(TARGET_DIR)/usr/share/udhcpc/default.script.d/
+
+ $(MAKE) -C $(@D)/po install
endef
PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL