oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "abuild: make built package reproducible"

Browse Source 
The introduction of the --pax-options seems to confuse apk and resulted
in `BAD archive' errors.

This reverts commit f04a2ee34b28a38c4349ef1f94686a07afce730f.
This commit is contained in:
Natanael Copa 2019-11-07 20:41:27 +00:00
parent 95cd15c025
commit 51d9e3bcb9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
abuild.in
View File

@ -1565,11 +1565,7 @@ create_apks() {
# normalize timestamps
find . -exec touch -h -d "@$SOURCE_DATE_EPOCH" {} +
tar --xattrs \
--format=posix \
--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime,delete=mtime \
--mtime="@${SOURCE_DATE_EPOCH}" \
-f - -c "$@" | abuild-tar --hash | $gzip -n -9 >"$dir"/data.tar.gz
tar --xattrs -f - -c "$@" | abuild-tar --hash | $gzip -9 >"$dir"/data.tar.gz
msg "Create checksum..."
# append the hash for data.tar.gz
@ -1579,12 +1575,8 @@ create_apks() {
# control.tar.gz
cd "$dir"
tar \
--format=posix \
--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime,delete=mtime \
--mtime="@${SOURCE_DATE_EPOCH}" \
-f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \
| $gzip -n -9 > control.tar.gz
tar -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \
| $gzip -9 > control.tar.gz
abuild-sign -q control.tar.gz || exit 1
msg "Create $apk"