aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2022-03-31 22:51:29 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-04-06 13:59:44 +0100
commitec2bc81c78585755491f9a1a3f30edb6312025f0 (patch)
tree2829b50dc4290ef28e302578209952505c45d042 /scripts
parentf56ddb0f588650927f65249462460595c683aee0 (diff)
downloadupstream-ec2bc81c78585755491f9a1a3f30edb6312025f0.tar.gz
upstream-ec2bc81c78585755491f9a1a3f30edb6312025f0.tar.bz2
upstream-ec2bc81c78585755491f9a1a3f30edb6312025f0.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> (cherry picked from commit 56ce110b73970bcd65d309440baada84c8e1504b)
Diffstat (limited to 'scripts')
-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