wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-01 05:22:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

test: upgrade BusyBox binary to v1.35.0 w/ mount helpers

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2022-09-25 04:37:16 +02:00
parent 03c08d3970
commit 9f7ba1ba79
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile.am
+15 -15
View File
@@ -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
test/skel/bin/busybox-x86_64.md5
-1
View File
@@ -1 +0,0 @@
ea7e2353af0067a926d3e021e504290e busybox-x86_64
test/skel/bin/busybox-x86_64.sha256
+1
View File
@@ -0,0 +1 @@
297fee002c1a4dad65e98634880afb530637af5ec0659115bec5e487ea2cc384 busybox-x86_64
test/tenv/root.mk
+13 -13
View File
@@ -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))%,%,$@) $@