summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpcyrd <git@rxv.cc>2019-12-03 21:31:44 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2020-01-30 10:41:06 +0000
commit4f5b0a14bdd715a36cd276788bc79e0a67a7672e (patch)
tree30bc2b20666a3f7b91704f1f60cd3f9f60cea66a
parent660f793d6de6291204ba044e03b37826d2e78e88 (diff)
downloadabuild-4f5b0a14bdd715a36cd276788bc79e0a67a7672e.tar.bz2
abuild-4f5b0a14bdd715a36cd276788bc79e0a67a7672e.tar.xz
abuild: explicitly sort apk content
-rw-r--r--abuild.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/abuild.in b/abuild.in
index f6cf13f..f04178b 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1607,13 +1607,15 @@ create_apks() {
fi
# normalize timestamps
- find . -exec touch -h -d "@$SOURCE_DATE_EPOCH" {} +
+ find "$@" -exec touch -h -d "@$SOURCE_DATE_EPOCH" {} +
- tar --xattrs \
+ # explicitly sort package content
+ find "$@" -print0 | LC_ALL=C sort -z | tar --xattrs \
--format=posix \
--pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 \
--mtime="@${SOURCE_DATE_EPOCH}" \
- -f - -c "$@" | abuild-tar --hash | $gzip -n -9 >"$dir"/data.tar.gz
+ --no-recursion --null -T - \
+ -f - -c | abuild-tar --hash | $gzip -n -9 >"$dir"/data.tar.gz
msg "Create checksum..."
# append the hash for data.tar.gz