From 6bf5d9856909ee7fbf7fdd1fb4904471993f2801 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 25 Sep 2022 06:54:55 +0200 Subject: [PATCH] test: fix distcheck BusyBox downloader for users with ~/.cache Signed-off-by: Joachim Wiberg --- test/tenv/root.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/tenv/root.mk b/test/tenv/root.mk index abe96cc3..e15e98d6 100644 --- a/test/tenv/root.mk +++ b/test/tenv/root.mk @@ -55,20 +55,20 @@ $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).sha256 if [ -d $(CACHE) ]; then \ echo "Cannot find $(BBBIN), checking $(CACHE) ..."; \ cd $(CACHE); \ - cp $(DEST)/bin/$(BBBIN).sha256 .; \ + cp -v $(DEST)/bin/$(BBBIN).sha256 .; \ if ! sha256sum --status -c $(BBBIN).sha256; then \ echo "No $(BBBIN), downloading $(BBURL) ..."; \ - wget -o $@ $(BBURL); \ + wget -O $(BBBIN) $(BBURL); \ else \ echo "Found valid $(BBBIN) in cache!"; \ - cp $(BBBIN) $@; \ fi; \ + cp $(BBBIN) $@; \ + cd $(dir $@); \ else \ echo "Cannot find $(BBBIN), downloading ..."; \ wget -O $@ $(BBURL); \ fi; \ - cd $(dir $@); \ - sha256sum -c $(BBBIN).sha256; \ + sha256sum -c $(BBBIN).sha256 || (rm $@; false); \ fi) @chmod +x $@