summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Aina <emanuele.aina@collabora.com>2021-04-12 12:24:08 +0200
committerAndrej Shadura <andrew.shadura@collabora.co.uk>2021-12-01 16:23:31 +0100
commit0e5e3412352f2c52b25d47e5f13019fb3c49f473 (patch)
tree9600b56adef7b905cc80c8fc5140bd4f96d6a76b
parentc971d65136dc26f1303eafd382b2ef4cebc6e2a7 (diff)
Force LC_ALL=C.UTF-8 when creating the chroot
This causes it to be set all the time, improving reproducibility and ensuring it is captured in the build logs, which can help when diagnosing issues. Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
-rw-r--r--debian/patches/Force-locale-to-C.UTF-8.patch32
-rw-r--r--debian/patches/series1
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/Force-locale-to-C.UTF-8.patch b/debian/patches/Force-locale-to-C.UTF-8.patch
new file mode 100644
index 0000000..4b6c75f
--- /dev/null
+++ b/debian/patches/Force-locale-to-C.UTF-8.patch
@@ -0,0 +1,32 @@
+From: Emanuele Aina <emanuele.aina@collabora.com>
+Date: Mon, 12 Apr 2021 12:10:17 +0200
+Subject: Force locale to C.UTF-8
+
+Multiple packages have run into build failures on our OBS. On closer
+inspection, it was concluded to be issues with the locale settings.
+
+These issues were never seen on the Debian buildd infrastructure because
+there the locale setting LC_ALL=C.UTF-8 is in use.
+
+This change keeps us closer to what is used in Debian buildds.
+
+https://github.com/openSUSE/obs-build/pull/665
+
+Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
+---
+ build-pkg-deb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build-pkg-deb b/build-pkg-deb
+index c5c6db0..94bcac3 100644
+--- a/build-pkg-deb
++++ b/build-pkg-deb
+@@ -37,7 +37,7 @@ deb_chroot ()
+ cd $1 &&
+ DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical \
+ DEBCONF_NONINTERACTIVE_SEEN=true \
+- LC_ALL=C LANGUAGE=C LANG=C \
++ LC_ALL=C.UTF-8 LANGUAGE=C.UTF-8 LANG=C.UTF-8 \
+ chroot $*
+ )
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1b70c88..c3f619e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ build-recipe-dsc-List-contents-of-build-results.patch
build-recipe-dsc-Show-information-about-the-build-chroot.patch
python3-openstack-console.patch
fallback-stable-dist.patch
+Force-locale-to-C.UTF-8.patch