From 9f7ba1ba7995e569c427b3ae23620eec6314b390 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sun, 25 Sep 2022 04:36:02 +0200
Subject: [PATCH] test: upgrade BusyBox binary to v1.35.0 w/ mount helpers

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 test/Makefile.am                    | 30 ++++++++++++++---------------
 test/skel/bin/busybox-x86_64.md5    |  1 -
 test/skel/bin/busybox-x86_64.sha256 |  1 +
 test/tenv/root.mk                   | 26 ++++++++++++-------------
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 test/skel/bin/busybox-x86_64.md5
 create mode 100644 test/skel/bin/busybox-x86_64.sha256

diff --git a/test/Makefile.am b/test/Makefile.am
index 8c9c4d27..caa59f21 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,20 +1,20 @@
 SUBDIRS                  = common tenv
 
-EXTRA_DIST		 = skel/bin/busybox-x86_64.md5 skel/sbin/service.sh skel/bin/slay  \
-			   skel/etc/env skel/bin/pre.sh skel/bin/post.sh skel/sbin/task.sh \
-			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	   \
-			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		   \
-			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	   \
-			   skel/etc/finit.d/.empty skel/etc/init.d/S01-service.sh 	   \
-			   skel/etc/init.d/S02-serv.sh					   \
-			   skel/proc/.empty skel/root/.empty skel/run/.empty		   \
-			   skel/sbin/chrootsetup.sh skel/srv/.empty skel/sys/.empty	   \
-			   skel/usr/bin/.empty skel/usr/lib/.empty skel/usr/sbin/.empty	   \
-			   skel/home/.empty skel/usr/games/.empty skel/usr/src/.empty	   \
-			   skel/usr/share/.empty skel/usr/include/.empty		   \
-			   skel/usr/local/games/.empty skel/usr/local/sbin/.empty	   \
-			   skel/usr/local/share/.empty skel/usr/local/src/.empty	   \
-			   skel/usr/local/lib/.empty skel/usr/local/bin/.empty		   \
+EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/bin/slay \
+			   skel/etc/env skel/bin/pre.sh skel/bin/post.sh skel/sbin/task.sh   \
+			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	     \
+			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		     \
+			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	     \
+			   skel/etc/finit.d/.empty skel/etc/init.d/S01-service.sh 	     \
+			   skel/etc/init.d/S02-serv.sh					     \
+			   skel/proc/.empty skel/root/.empty skel/run/.empty		     \
+			   skel/sbin/chrootsetup.sh skel/srv/.empty skel/sys/.empty	     \
+			   skel/usr/bin/.empty skel/usr/lib/.empty skel/usr/sbin/.empty	     \
+			   skel/home/.empty skel/usr/games/.empty skel/usr/src/.empty	     \
+			   skel/usr/share/.empty skel/usr/include/.empty		     \
+			   skel/usr/local/games/.empty skel/usr/local/sbin/.empty	     \
+			   skel/usr/local/share/.empty skel/usr/local/src/.empty	     \
+			   skel/usr/local/lib/.empty skel/usr/local/bin/.empty		     \
 			   skel/usr/local/etc/.empty skel/var/.empty
 
 EXTRA_DIST		+= setup-root.sh
diff --git a/test/skel/bin/busybox-x86_64.md5 b/test/skel/bin/busybox-x86_64.md5
deleted file mode 100644
index 0ecfec84..00000000
--- a/test/skel/bin/busybox-x86_64.md5
+++ /dev/null
@@ -1 +0,0 @@
-ea7e2353af0067a926d3e021e504290e  busybox-x86_64
diff --git a/test/skel/bin/busybox-x86_64.sha256 b/test/skel/bin/busybox-x86_64.sha256
new file mode 100644
index 00000000..57a17860
--- /dev/null
+++ b/test/skel/bin/busybox-x86_64.sha256
@@ -0,0 +1 @@
+297fee002c1a4dad65e98634880afb530637af5ec0659115bec5e487ea2cc384  busybox-x86_64
diff --git a/test/tenv/root.mk b/test/tenv/root.mk
index bb0d73d0..abe96cc3 100644
--- a/test/tenv/root.mk
+++ b/test/tenv/root.mk
@@ -29,10 +29,10 @@ ARCH           ?= x86_64
 
 FINITBIN       ?= ./sbin/finit
 
-BBVER          ?= 1.31.0
+BBVER          ?= 1_35_0
 BBBIN           = busybox-$(ARCH)
-BBHOME         ?= https://www.busybox.net/downloads/binaries
-BBURL          ?= $(BBHOME)/$(BBVER)-defconfig-multiarch-musl/$(BBBIN)
+BBHOME         ?= https://github.com/troglobit/busybox-builder/releases/download
+BBURL          ?= $(BBHOME)/$(BBVER)/$(BBBIN)
 
 _libs_src       = $(shell ldd $(FINITBIN) | grep -Eo '/[^ ]+')
 libs            = $(foreach path,$(_libs_src),$(abspath $(DEST))$(path))
@@ -43,35 +43,35 @@ all: $(libs) $(DEST)/bin/$(BBBIN)
 		ln -sf /bin/$(BBBIN) $$prg;		\
 	done)
 
-$(DEST)/bin/$(BBBIN).md5:
+$(DEST)/bin/$(BBBIN).sha256:
 	@mkdir -p $(DEST)
 	@cp -a $(SKEL)/* $(DEST)/
 	@chmod -R u+w $(DEST)/
 	@find $(DEST) -name .empty -delete
 
-$(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
+$(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).sha256
 	@(cd $(dir $@);								\
-	if ! md5sum --status -c $(BBBIN).md5 2>/dev/null; then			\
+	if ! sha256sum --status -c $(BBBIN).sha256 2>/dev/null; then		\
 		if [ -d $(CACHE) ]; then					\
 			echo "Cannot find $(BBBIN), checking $(CACHE) ...";	\
 			cd $(CACHE);						\
-			cp $(DEST)/bin/$(BBBIN).md5 .;				\
-			if ! md5sum --status -c $(BBBIN).md5; then		\
-				echo "No $(BBBIN) available downloading ...";	\
-				wget $(BBURL);					\
+			cp $(DEST)/bin/$(BBBIN).sha256 .;			\
+			if ! sha256sum --status -c $(BBBIN).sha256; then	\
+				echo "No $(BBBIN), downloading $(BBURL) ...";	\
+				wget -o $@ $(BBURL);				\
 			else							\
 				echo "Found valid $(BBBIN) in cache!";		\
+				cp $(BBBIN) $@;					\
 			fi;							\
-			cp $(BBBIN) $@;						\
 		else								\
 			echo "Cannot find $(BBBIN), downloading ...";		\
 			wget -O $@ $(BBURL);					\
 		fi;								\
 		cd $(dir $@);							\
-		md5sum -c $(BBBIN).md5;						\
+		sha256sum -c $(BBBIN).sha256;					\
 	fi)
 	@chmod +x $@
 
-$(libs): $(DEST)/bin/$(BBBIN).md5
+$(libs): $(DEST)/bin/$(BBBIN).sha256
 	mkdir -p $(dir $@)
 	cp $(patsubst $(abspath $(DEST))%,%,$@) $@