From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 6 Apr 2022 16:25:16 +0000 (+0100)
Subject: scripts: make sure sort-order is independent from locale
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1d77dca3b32dd883bcc2213675cf21111ac1beca;p=openwrt%2Fstaging%2Fthess.git

scripts: make sure sort-order is independent from locale

Set LC_ALL=C environment variable when calling 'sort' as the sort
order otherwise depends on the locale set.

Fixes: 56ce110b73 ("scripts: make sure conffiles are sorted")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 32bc4b6d50..19df621048 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -58,7 +58,7 @@ pkg_appears_sane() {
 
 		rm "$CONTROL"/conffiles
 		if [ -f "$CONTROL"/conffiles.resolved ]; then
-			sort -o "$CONTROL"/conffiles "$CONTROL"/conffiles.resolved
+			LC_ALL=C sort -o "$CONTROL"/conffiles "$CONTROL"/conffiles.resolved
 			rm "$CONTROL"/conffiles.resolved
 			chmod 0644 "$CONTROL"/conffiles
 		fi