moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

busybox: du: use 1024 unit size

Browse source 
make -k the default (write the files sizes in units of 1024 bytes)
else it uses 512 which differs from coreutils-du and toybox-du

cleanup the template while at it
This commit is contained in:
Piraty 2021-04-28 11:56:02 +02:00 • committed by Piraty
parent 07f683c356
commit 25f3674b3b
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/busybox/files/dotconfig
View file

@ -227,7 +227,7 @@ CONFIG_DIRNAME=y
# CONFIG_DOS2UNIX is not set # CONFIG_DOS2UNIX is not set
# CONFIG_UNIX2DOS is not set # CONFIG_UNIX2DOS is not set
CONFIG_DU=y CONFIG_DU=y
# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
CONFIG_ECHO=y CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y
CONFIG_ENV=y CONFIG_ENV=y

18
srcpkgs/busybox/template
View file

@ -1,7 +1,7 @@
# Template file for 'busybox' # Template file for 'busybox'
pkgname=busybox pkgname=busybox
version=1.32.1 version=1.32.1
revision=2 revision=3
hostmakedepends="perl" hostmakedepends="perl"
checkdepends="tar which zip" checkdepends="tar which zip"
short_desc="Swiss Army Knife of Embedded Linux" short_desc="Swiss Army Knife of Embedded Linux"
@ -48,12 +48,12 @@ do_configure() {
cp -f ${FILESDIR}/dotconfig ${t}/.config cp -f ${FILESDIR}/dotconfig ${t}/.config
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \ *-musl) vsed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
${t}/.config;; ${t}/.config;;
esac esac
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
sed -i -e \ vsed -i -e \
"s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \ "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \
${t}/.config ${t}/.config
fi fi
@ -83,15 +83,9 @@ do_build() {
do_check() { do_check() {
for t in busybox-core busybox busybox-static busybox-huge; do for t in busybox-core busybox busybox-static busybox-huge; do
# Copy the testsuite over make -C "${t}" "${makejobs}" \
cp -r src/testsuite "${t}" SKIP_KNOWN_BUGS=yes SKIP_INTERNET_TESTS=yes \
# Required by the testsuite check
cp src/scripts/echo.c "${t}/scripts"
# Run the testsuite
(
cd "${t}/testsuite"
SKIP_KNOWN_BUGS=yes ./runtest -v
)
done done
} }