diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig index b661bbda790..c7d524cf1ba 100644 --- a/srcpkgs/busybox/files/dotconfig +++ b/srcpkgs/busybox/files/dotconfig @@ -227,7 +227,7 @@ CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index 1d24e7ea110..07377569ba5 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,7 +1,7 @@ # Template file for 'busybox' pkgname=busybox version=1.32.1 -revision=2 +revision=3 hostmakedepends="perl" checkdepends="tar which zip" short_desc="Swiss Army Knife of Embedded Linux" @@ -48,12 +48,12 @@ do_configure() { cp -f ${FILESDIR}/dotconfig ${t}/.config 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;; esac if [ "$CROSS_BUILD" ]; then - sed -i -e \ + vsed -i -e \ "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \ ${t}/.config fi @@ -83,15 +83,9 @@ do_build() { do_check() { for t in busybox-core busybox busybox-static busybox-huge; do - # Copy the testsuite over - cp -r src/testsuite "${t}" - # Required by the testsuite - cp src/scripts/echo.c "${t}/scripts" - # Run the testsuite - ( - cd "${t}/testsuite" - SKIP_KNOWN_BUGS=yes ./runtest -v - ) + make -C "${t}" "${makejobs}" \ + SKIP_KNOWN_BUGS=yes SKIP_INTERNET_TESTS=yes \ + check done }