From ec2bc81c78585755491f9a1a3f30edb6312025f0 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 31 Mar 2022 22:51:29 +0100 Subject: 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 (cherry picked from commit 56ce110b73970bcd65d309440baada84c8e1504b) --- scripts/ipkg-build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3