From b284128d7b5e90cdb558d55b4bb5ddb4c55cc7dc Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 22 Aug 2023 16:53:55 +0200 Subject: [PATCH] Revert "cirrus setup: install en_US.UTF-8 locale" This reverts commit ed1f514d5512d229b4285de8316dfa65cdd5e3df. The en_US.UTF-8 locale is now added in the images at build time, https://github.com/containers/automation_images/pull/295 Signed-off-by: Paul Holzinger --- contrib/cirrus/setup_environment.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index b37da76c6a..d416299b4c 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -156,11 +156,6 @@ case "$OS_RELEASE_ID" in # (Checked on 2023-08-08 and it's still too old: 1.1.5) # FIXME: please remove this once runc >= 1.2 makes it into debian. showrun modprobe tun - - # TODO: move this into image build process - # We need the "en_US.UTF-8" locale for the "podman logs with non ASCII log tag" tests - showrun sed -i '/en_US.UTF-8/s/^#//g' /etc/locale.gen - showrun locale-gen ;; fedora) showrun echo "conditional setup for fedora"