Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-06-08 11:38:52 +0300
committernl6720 <nl6720@gmail.com>2022-06-09 08:27:50 +0300
commitba11c40e495b8c6278a3ff801cc11065a135c289 (patch)
tree22043f9bae986882aada8374f1884ec167e72fd4
parent89292ce8188ce63b8c59c52bc590609ccde4f60d (diff)
configs/: use the C.UTF-8 locale
The glibc 2.35-6 package ships with the C.UTF-8 locale included. This means there is now a UTF-8 locale available by default and en_US.UTF-8, which requires editing /etc/locale.gen and running locale-gen, is not needed anymore. Implements #175.
-rw-r--r--CHANGELOG.rst7
-rw-r--r--configs/baseline/airootfs/etc/locale.conf1
-rw-r--r--configs/releng/airootfs/etc/locale.conf2
-rw-r--r--configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook13
4 files changed, 9 insertions, 14 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0b95f02..d8812c0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,12 +8,19 @@ Changelog
Added
-----
+- Configure the locale for the baseline profile to ``C.UTF-8`` so that a UTF-8 locale is used.
+
Changed
-------
+- Change the releng profile's locale from ``en_US.UTF-8`` to ``C.UTF-8``.
+
Removed
-------
+- Remove the custom pacman hook that ran ``locale-gen`` on glibc install from the releng profile. The used locale now
+ ships with the glibc package itself.
+
[64] - 2022-05-30
=================
diff --git a/configs/baseline/airootfs/etc/locale.conf b/configs/baseline/airootfs/etc/locale.conf
new file mode 100644
index 0000000..f9c983c
--- /dev/null
+++ b/configs/baseline/airootfs/etc/locale.conf
@@ -0,0 +1 @@
+LANG=C.UTF-8
diff --git a/configs/releng/airootfs/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf
index 01ec548..f9c983c 100644
--- a/configs/releng/airootfs/etc/locale.conf
+++ b/configs/releng/airootfs/etc/locale.conf
@@ -1 +1 @@
-LANG=en_US.UTF-8
+LANG=C.UTF-8
diff --git a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
deleted file mode 100644
index 82dd199..0000000
--- a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
+++ /dev/null
@@ -1,13 +0,0 @@
-# remove from airootfs!
-[Trigger]
-Operation = Install
-Type = Package
-Target = glibc
-
-[Action]
-Description = Uncommenting en_US.UTF-8 locale and running locale-gen...
-When = PostTransaction
-Depends = glibc
-Depends = sed
-Depends = sh
-Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen"