From: Paul Spooren <mail@aparcar.org>
Date: Thu, 31 Mar 2022 21:51:29 +0000 (+0100)
Subject: scripts: make sure conffiles are sorted
X-Git-Tag: v22.03.0-rc1~80
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec2bc81c78585755491f9a1a3f30edb6312025f0;p=openwrt%2Fstaging%2Fhauke.git

scripts: make sure conffiles are sorted

It may happen that conffiles are in different order on different builds.
Make sure they have the same order by sorting them.

FIX: #9612

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 56ce110b73970bcd65d309440baada84c8e1504b)
---

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