mirror of
https://gitlab.archlinux.org/archlinux/archlinux-docker.git
synced 2025-08-05 13:47:16 +02:00
Use C.UTF-8
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.
This commit is contained in:
parent
5a681fd335
commit
18e8a88aec
@ -26,5 +26,5 @@ COPY --from=verify /rootfs/ /
|
||||
RUN ldconfig && \
|
||||
sed -i '/BUILD_ID/a VERSION_ID=TEMPLATE_VERSION_ID' /etc/os-release
|
||||
|
||||
ENV LANG=en_US.UTF-8
|
||||
ENV LANG=C.UTF-8
|
||||
CMD ["/usr/bin/bash"]
|
||||
|
1
Makefile
1
Makefile
@ -19,7 +19,6 @@ define rootfs
|
||||
cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/
|
||||
|
||||
fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust
|
||||
fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen
|
||||
fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"'
|
||||
|
||||
ln -fs /usr/lib/os-release $(BUILDDIR)/etc/os-release
|
||||
|
@ -1,9 +1,10 @@
|
||||
[options]
|
||||
NoExtract = usr/share/help/* !usr/share/help/en*
|
||||
NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*
|
||||
NoExtract = usr/share/gtk-doc/html/* usr/share/doc/*
|
||||
NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
|
||||
NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
|
||||
NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
|
||||
NoExtract = !usr/share/*locales/trans*
|
||||
NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
|
||||
NoExtract = usr/share/man/* usr/share/info/*
|
||||
NoExtract = usr/share/vim/vim*/lang/*
|
||||
|
@ -1 +1 @@
|
||||
LANG=en_US.UTF-8
|
||||
LANG=C.UTF-8
|
||||
|
@ -1 +0,0 @@
|
||||
en_US.UTF-8 UTF-8
|
Loading…
Reference in New Issue
Block a user