From f26cb61cb6a16c8ce85f33e6090763aced0118c3 Mon Sep 17 00:00:00 2001 From: Santiago Torres Date: Mon, 11 Mar 2019 22:24:35 -0400 Subject: Make makepkg compute sizes properly Makepkg used to use du --apparent-size to compute the size of the package. Unfortunately, this would result in different sizes depending on the filesystem used (e.g., btrfs vs ext4), which would affect reproducible builds. Use a wc-based approach to compute sizes Signed-off-by: Santiago Torres Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e12826af..4f096a36 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -588,8 +588,7 @@ write_kv_pair() { } write_pkginfo() { - local size="$(@DUPATH@ @DUFLAGS@)" - size="$(( ${size%%[^0-9]*} * 1024 ))" + local size="$(find . -type f -exec cat {} + 2>/dev/null | wc -c)" merge_arch_attrs -- cgit v1.2.3-54-g00ecf