[openwrt/openwrt] scripts: make sure sort-order is independent from locale

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 6 09:37:51 PDT 2022


dangole pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/087795323576ab8f4478f5aa3568adaec717d26f

commit 087795323576ab8f4478f5aa3568adaec717d26f
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Wed Apr 6 17:25:16 2022 +0100

    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 at makrotopia.org>
    (cherry picked from commit 1d77dca3b32dd883bcc2213675cf21111ac1beca)
---
 scripts/ipkg-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the lede-commits mailing list