summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am1
-rw-r--r--scripts/makepkg.sh.in7
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2bd64118..c3c1d73a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -57,6 +57,7 @@ edit = sed \
-e "s|@INODECMD[@]|$(INODECMD)|g" \
-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
-e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \
+ -e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \
-e 's|@DUPATH[@]|$(DUPATH)|g' \
-e 's|@SCRIPTNAME[@]|$@|g' \
-e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g'
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ff3fa5b8..ceaab612 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1704,12 +1704,7 @@ write_pkginfo() {
local packager="Unknown Packager"
fi
- # btrfs's delayed allocation causes the stat buffers from the kernel to "lie"
- # to us momentarily and report 0 blocks allocated (which is how du calculates
- # size). Sleeping for a second here is about the dirtiest thing possible,
- # but avoids reporting entirely bogus install sizes.
- sleep 1
- local size="$(@DUPATH@ -sk)"
+ local size="$(@DUPATH@ @DUFLAGS@)"
size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating %s file...")" ".PKGINFO"