domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: make sure conffiles are sorted

Browse Source 
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 56ce110b73)
This commit is contained in:
Paul Spooren
2022-03-31 22:51:29 +01:00
committed by Daniel Golle
parent f56ddb0f58
commit ec2bc81c78
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/ipkg-build
View File

@@ -58,7 +58,8 @@ pkg_appears_sane() {
rm "$CONTROL"/conffiles rm "$CONTROL"/conffiles
if [ -f "$CONTROL"/conffiles.resolved ]; then 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 chmod 0644 "$CONTROL"/conffiles
fi fi
fi fi