aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2022-03-31 22:51:29 +0100
committerPaul Spooren <mail@aparcar.org>2022-04-01 13:08:58 +0100
commit56ce110b73970bcd65d309440baada84c8e1504b (patch)
tree067d3ba4c3134e1397670241028225f7b253f5ef
parent950bd40a275d1a834c95d8f9830e1bfed4737a82 (diff)
downloadupstream-56ce110b73970bcd65d309440baada84c8e1504b.tar.gz
upstream-56ce110b73970bcd65d309440baada84c8e1504b.tar.bz2
upstream-56ce110b73970bcd65d309440baada84c8e1504b.zip
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>
-rwxr-xr-xscripts/ipkg-build3
1 files changed, 2 insertions, 1 deletions
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