[PR PATCH] busybox: du: use 1024 unit size

[PR PATCH] busybox: du: use 1024 unit size

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages busybox-du-1024
https://github.com/void-linux/void-packages/pull/30562

busybox: du: use 1024 unit size
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

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR


A patch file from https://github.com/void-linux/void-packages/pull/30562.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-busybox-du-1024-30562.patch --]
[-- Type: text/x-diff, Size: 2219 bytes --]

From 2d180cf6738bbe643ca9a235b392849e7a6dab5d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 28 Apr 2021 11:56:02 +0200
Subject: [PATCH] busybox: du: use 1024 unit size

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
---
 srcpkgs/busybox/files/dotconfig |  2 +-
 srcpkgs/busybox/template        | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index b661bbda790c..c7d524cf1ba1 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 1d24e7ea1108..07377569ba5f 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
 }
 

Re: [PR PATCH] [Merged]: busybox: du: use 1024 unit size

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

There's a merged pull request on the void-packages repository

busybox: du: use 1024 unit size
https://github.com/void-linux/void-packages/pull/30562

Description:
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

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR