From 6b144aa7dd8495664115a5b31f31151ca66ea062 Mon Sep 17 00:00:00 2001
From: David Galloway <david.galloway@ibm.com>
Date: Fri, 19 Dec 2025 08:49:26 -0500
Subject: [PATCH] Ensure locales are installed. Set correct format.

I guess Ubuntu just tolerated the incorrect spelling.  Or used to?  Anyway..

```
root@toko07:~# grep PRETTY_NAME /etc/os-release
PRETTY_NAME="Ubuntu 24.04.3 LTS"
root@toko07:~# locale -a | grep -i en_us
en_US.utf8

[root@toko08 ~]# grep PRETTY_NAME /etc/os-release
PRETTY_NAME="CentOS Stream 9"
[root@toko08 ~]# locale -a | grep -i en_us
en_US
en_US.iso885915
en_US.utf8
```

Signed-off-by: David Galloway <david.galloway@ibm.com>
---
 ansible/examples/builder.yml | 12 +++++++++---
 scripts/build_utils.sh       |  4 ----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ansible/examples/builder.yml b/ansible/examples/builder.yml
index 9163bcf9..f1acbb84 100644
--- a/ansible/examples/builder.yml
+++ b/ansible/examples/builder.yml
@@ -183,6 +183,7 @@
           - jq
           - tmpreaper
           - podman
+          - locales
         tmp_cleaner_name: tmpreaper
         tmp_cleaner_args: "--runtime=0 14d /tmp/"
       when: ansible_os_family == "Debian"
@@ -284,6 +285,7 @@
           - openssl-devel
           - libffi-devel
           - tmpwatch
+          - glibc-langpack-en
         tmp_cleaner_name: tmpwatch
         tmp_cleaner_args: "14d /tmp/"
       when: ansible_os_family == "RedHat"
@@ -721,7 +723,7 @@
       lineinfile:
         dest: "/home/{{ jenkins_user }}/.bashrc"
         regexp: '^export LC_ALL='
-        line: "export LC_ALL=en_US.UTF-8"
+        line: "export LC_ALL=en_US.utf8"
         create: true
         state: present
 
@@ -729,13 +731,13 @@
       lineinfile:
         dest: "/home/{{ jenkins_user }}/.bashrc"
         regexp: '^export LANG='
-        line: "export LANG=en_US.UTF-8"
+        line: "export LANG=en_US.utf8"
 
     - name: Set utf-8 for LANGUAGE
       lineinfile:
         dest: "/home/{{ jenkins_user }}/.bashrc"
         regexp: '^export LANGUAGE='
-        line: "export LANGUAGE=en_US.UTF-8"
+        line: "export LANGUAGE=en_US.utf8"
 
     - name: Ensure the build dir exists
       file:
@@ -768,6 +770,10 @@
       command: "sudo chown -R {{ jenkins_user }}:{{ jenkins_user }} /home/{{ jenkins_user}}"
       tags: chown
 
+    - name: Set system locale (systemd)
+      command: localectl set-locale LANG=en_US.utf8
+      when: ansible_service_mgr == "systemd"
+
     ## DEBIAN GPG KEY TASKS
     - name: Install Debian GPG Keys on Ubuntu
       block:
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index ca12b679..8170b2b8 100755
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -210,10 +210,6 @@ install_python_packages () {
     PIP_SDIST_INDEX="$HOME/.cache/pip"
     mkdir -p $PIP_SDIST_INDEX
 
-    # Avoid UnicodeErrors when installing packages.
-    # See https://github.com/ceph/ceph/pull/42811
-    export LC_ALL=en_US.UTF-8
-
     if [ "$2" == "latest" ]; then
         echo "Ensuring latest pip is installed"
         $venv/pip install -U pip
-- 
2.47.3