abuild: calculate size only based on st_size of normal files
Fixes [#10134] [#10134]: https://gitlab.alpinelinux.org/alpine/abuild/-/issues/10134
This commit is contained in:
Sertonix
parent
a45d12d4c3
commit
a53d826050
22
abuild.in
22
abuild.in
|
|
@ -1122,7 +1122,7 @@ prepare_metafiles() {
|
|||
local dir=${subpkgdir:-$pkgdir}
|
||||
local pkg="$name-$pkgver-r$pkgrel.apk"
|
||||
local pkginfo="$controldir"/.PKGINFO
|
||||
local sub
|
||||
local sub i size
|
||||
|
||||
[ ! -d "$dir" ] && die "Missing $dir"
|
||||
cd "$dir"
|
||||
|
|
@ -1135,15 +1135,27 @@ prepare_metafiles() {
|
|||
sync;;
|
||||
esac
|
||||
|
||||
local size=$(du -sk | awk '{print $1 * 1024}')
|
||||
size=$(
|
||||
set -o pipefail
|
||||
{ echo 0; find . -type f -exec stat -c '%d:%i %s' -- {} + |
|
||||
awk '!x[$1]++ {print $2}'; } | paste -sd+ | bc | tr -d '\\\n'
|
||||
)
|
||||
# If package contains only empty files (or only install scripts), the size
|
||||
# might be 0. But due to apk-tools 2 considering packages with size = 0
|
||||
# virtual, nothing is extracted (and no scripts are ran). That will be
|
||||
# solved in apk-tools 3. As a workaround we can set the size to 1 if any
|
||||
# files are present or install scripts are defined.
|
||||
if [ "$size" -eq 0 ]; then
|
||||
if [ -n "$install" ] || [ -n "$(find . ! -name .)" ]; then
|
||||
if [ "$size" = 0 ]; then
|
||||
if [ -n "$(find . ! -name .)" ]; then
|
||||
size=1
|
||||
else
|
||||
for i in $install $trigger; do
|
||||
local j=${i%=*}
|
||||
[ "${j%.*}" = "$name" ] && {
|
||||
size=1
|
||||
break
|
||||
}
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -1169,7 +1181,7 @@ prepare_metafiles() {
|
|||
arch = ${subpkgarch:-$pkgarch}
|
||||
origin = $pkgname
|
||||
EOF
|
||||
local i deps
|
||||
local deps
|
||||
deps="$depends"
|
||||
if [ "$pkgname" != "busybox" ] && ! depends_has busybox && ! depends_has /bin/sh; then
|
||||
for i in $install $triggers; do
|
||||
|
|
|
|||
|
|
@ -31,8 +31,7 @@ init_tests \
|
|||
abuild_multiline_license \
|
||||
abuild_license_spdx \
|
||||
abuild_git_ceiling \
|
||||
abuild_package_size_zero \
|
||||
abuild_package_size_nonzero \
|
||||
abuild_package_size \
|
||||
abuild_keepdirs \
|
||||
abuild_amove \
|
||||
abuild_doc \
|
||||
|
|
@ -571,75 +570,114 @@ abuild_git_ceiling_body() {
|
|||
abuild
|
||||
}
|
||||
|
||||
create_fake_du() {
|
||||
mkdir -p bin
|
||||
cat > bin/du <<-EOF
|
||||
#!/bin/sh
|
||||
echo 0
|
||||
EOF
|
||||
chmod +x bin/du
|
||||
PATH="$PWD/bin:$PATH"
|
||||
}
|
||||
|
||||
abuild_package_size_zero_body() {
|
||||
abuild_package_size_body() {
|
||||
init_keys
|
||||
mkdir -p test-size
|
||||
create_fake_du
|
||||
|
||||
cd test-size
|
||||
cat > APKBUILD <<-EOF
|
||||
# Maintainer: Test User 123 <123@example.com>
|
||||
|
||||
# test package
|
||||
pkgname="test-size"
|
||||
pkgname="test-size"
|
||||
pkgver="1.0"
|
||||
pkgrel=0
|
||||
pkgdesc='Dummy test package that has no files'
|
||||
url='https://gitlab.alpinelinux.org/alpine/aports'
|
||||
arch='noarch'
|
||||
license='MIT'
|
||||
install="\$pkgname.post-install"
|
||||
install="\$pkgname-empty-script.post-install"
|
||||
trigger="\$pkgname-empty-trigger.trigger=/"
|
||||
subpackages="
|
||||
\$pkgname-empty-noscript:_empty
|
||||
\$pkgname-empty-script:_empty
|
||||
\$pkgname-empty-trigger:_empty
|
||||
\$pkgname-dirs:_dirs
|
||||
\$pkgname-files:_files
|
||||
\$pkgname-many:_many
|
||||
\$pkgname-holes:_holes
|
||||
\$pkgname-hardlink:_hardlink
|
||||
\$pkgname-symlink:_symlink
|
||||
"
|
||||
|
||||
# Test if multi line bc output is handle properly
|
||||
export BC_LINE_LENGTH=1
|
||||
|
||||
package() {
|
||||
mkdir -p "\$pkgdir"
|
||||
}
|
||||
|
||||
_empty() {
|
||||
mkdir -p "\$subpkgdir"
|
||||
}
|
||||
|
||||
_dirs() {
|
||||
mkdir -p "\$subpkgdir/a/ /v/e/r/y/ /d/e/e/p/ /d/i/r"
|
||||
mkdir -p "\$subpkgdir"/b "\$subpkgdir"/c
|
||||
}
|
||||
|
||||
_files() {
|
||||
mkdir -p "\$subpkgdir"
|
||||
cd "\$subpkgdir"
|
||||
printf 'test\\n' > test
|
||||
touch empty
|
||||
mkdir -p dir
|
||||
printf 'more\\n' > dir/more
|
||||
printf 'size leak!\\n' > secret
|
||||
chmod a-rwx secret
|
||||
printf 'quoting and stuff\\n' > dir/"\\\$can't \\"touch \\\\this"
|
||||
}
|
||||
|
||||
_many() {
|
||||
mkdir -p "\$subpkgdir"
|
||||
for i in \$(seq 10000); do
|
||||
printf '\\n' > "\$subpkgdir/\$i"
|
||||
done
|
||||
}
|
||||
|
||||
_holes() {
|
||||
mkdir -p "\$subpkgdir"
|
||||
dd if=/dev/zero bs=1 seek=65534 count=1 of="\$subpkgdir"/holes
|
||||
}
|
||||
|
||||
_hardlink() {
|
||||
mkdir -p "\$subpkgdir"
|
||||
cd "\$subpkgdir"
|
||||
printf 'test\\n' > test
|
||||
ln test link
|
||||
ln test link2
|
||||
}
|
||||
|
||||
_symlink() {
|
||||
mkdir -p "\$subpkgdir"
|
||||
ln -s / "\$subpkgdir"/link
|
||||
}
|
||||
EOF
|
||||
cat > test-size.post-install <<-EOF
|
||||
cat > test-size-empty-script.post-install <<-EOF
|
||||
#!/bin/sh
|
||||
echo 1
|
||||
EOF
|
||||
cat > test-size-empty-trigger.trigger <<-EOF
|
||||
#!/bin/sh
|
||||
echo 1
|
||||
EOF
|
||||
abuild rootpkg
|
||||
# should be set to 1
|
||||
atf_check -o match:'^size = 1$' \
|
||||
cat pkg/.control.test-size/.PKGINFO
|
||||
}
|
||||
|
||||
abuild_package_size_nonzero_body() {
|
||||
init_keys
|
||||
mkdir -p test-size
|
||||
|
||||
cd test-size
|
||||
cat > APKBUILD <<-EOF
|
||||
# Maintainer: Test User 123 <123@example.com>
|
||||
|
||||
# test package
|
||||
pkgname="test-size"
|
||||
pkgver="1.0"
|
||||
pkgrel=0
|
||||
pkgdesc='Dummy test package that has files'
|
||||
url='https://gitlab.alpinelinux.org/alpine/aports'
|
||||
arch='noarch'
|
||||
license='MIT'
|
||||
|
||||
package() {
|
||||
mkdir -p "\$pkgdir"
|
||||
printf "%s" "very important data" > "\$pkgdir"/testfile
|
||||
}
|
||||
EOF
|
||||
abuild rootpkg
|
||||
# should not be set to 1
|
||||
atf_check -o not-match:'^size = 1$' \
|
||||
cat pkg/.control.test-size/.PKGINFO
|
||||
local i size
|
||||
for i in \
|
||||
empty-noscript:0 \
|
||||
empty-script:1 \
|
||||
empty-trigger:1 \
|
||||
dirs:1 \
|
||||
files:39 \
|
||||
many:10000 \
|
||||
holes:65535 \
|
||||
hardlink:5 \
|
||||
symlink:1 \
|
||||
; do \
|
||||
size=$(awk -F ' = ' '$1 == "size" {print $2}' pkg/.control.test-size-${i%:*}/.PKGINFO)
|
||||
[ "$size" -eq "${i#*:}" ] ||
|
||||
atf_fail "$i failed: got $size"
|
||||
done
|
||||
}
|
||||
|
||||
abuild_keepdirs_body() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue