fix build

bluenviron · Aug 20, 2024 · 87d4490 · 87d4490
1 parent 3aa529e
commit 87d4490
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/utils.mk b/utils.mk
@@ -45,7 +45,7 @@ export DOCKERFILE_BUILD_32
 
 build_32: enable_multiarch
 	echo "$$DOCKERFILE_BUILD_32" | docker build . -f - -t build32
-	docker run --rm -v $(PWD):/o build32 sh -c "rm -rf /o/build/mtxrpicam_32 && mv /s/build/mtxrpicam_32 /o/"
+	docker run --rm -v $(PWD):/o build32 sh -c "mkdir -p /o/build && rm -rf /o/build/mtxrpicam_32 && mv /s/build/mtxrpicam_32 /o/build/"
 
 define DOCKERFILE_BUILD_64
 FROM multiarch/qemu-user-static:x86_64-aarch64 AS qemu
@@ -72,7 +72,7 @@ export DOCKERFILE_BUILD_64
 
 build_64: enable_multiarch
 	echo "$$DOCKERFILE_BUILD_64" | docker build . -f - -t build64
-	docker run --rm -v $(PWD):/o build64 sh -c "rm -rf /o/build/mtxrpicam_64 && mv /s/build/mtxrpicam_64 /o/"
+	docker run --rm -v $(PWD):/o build64 sh -c "mkdir -p /o/build && rm -rf /o/build/mtxrpicam_64 && mv /s/build/mtxrpicam_64 /o/build/"
 
 define DOCKERFILE_TEST_BULLSEYE_32
 FROM multiarch/qemu-user-static:x86_64-arm AS qemu
@@ -83,7 +83,7 @@ export DOCKERFILE_TEST_BULLSEYE_32
 
 test_bullseye_32: enable_multiarch
 	echo "$$DOCKERFILE_TEST_BULLSEYE_32" | docker build . -f - -t test_bullseye_32
-	docker run --rm --platform=linux/arm/v6 -v $(PWD):/s -w /s/mtxrpicam_32 test_bullseye_32 bash -c "LD_LIBRARY_PATH=. TEST=1 ./exe"
+	docker run --rm --platform=linux/arm/v6 -v $(PWD):/s -w /s/build/mtxrpicam_32 test_bullseye_32 bash -c "LD_LIBRARY_PATH=. TEST=1 ./mtxrpicam"
 
 define DOCKERFILE_TEST_BULLSEYE_64
 FROM multiarch/qemu-user-static:x86_64-aarch64 AS qemu
@@ -94,7 +94,7 @@ export DOCKERFILE_TEST_BULLSEYE_64
 
 test_bullseye_64: enable_multiarch
 	echo "$$DOCKERFILE_TEST_BULLSEYE_64" | docker build . -f - -t test_bullseye_64
-	docker run --rm --platform=linux/arm64/v8 -v $(PWD):/s -w /s/mtxrpicam_64 test_bullseye_64 bash -c "LD_LIBRARY_PATH=. TEST=1 ./exe"
+	docker run --rm --platform=linux/arm64/v8 -v $(PWD):/s -w /s/build/mtxrpicam_64 test_bullseye_64 bash -c "LD_LIBRARY_PATH=. TEST=1 ./mtxrpicam"
 
 define DOCKERFILE_TEST_BOOKWORM_32
 FROM multiarch/qemu-user-static:x86_64-arm AS qemu
@@ -105,7 +105,7 @@ export DOCKERFILE_TEST_BOOKWORM_32
 
 test_bookworm_32: enable_multiarch
 	echo "$$DOCKERFILE_TEST_BOOKWORM_32" | docker build . -f - -t test_bookworm_32
-	docker run --rm --platform=linux/arm/v6 -v $(PWD):/s -w /s/mtxrpicam_32 test_bookworm_32 bash -c "LD_LIBRARY_PATH=. TEST=1 ./exe"
+	docker run --rm --platform=linux/arm/v6 -v $(PWD):/s -w /s/build/mtxrpicam_32 test_bookworm_32 bash -c "LD_LIBRARY_PATH=. TEST=1 ./mtxrpicam"
 
 define DOCKERFILE_TEST_BOOKWORM_64
 FROM multiarch/qemu-user-static:x86_64-aarch64 AS qemu
@@ -116,4 +116,4 @@ export DOCKERFILE_TEST_BOOKWORM_64
 
 test_bookworm_64: enable_multiarch
 	echo "$$DOCKERFILE_TEST_BOOKWORM_64" | docker build . -f - -t test_bookworm_64
-	docker run --rm --platform=linux/arm64/v8 -v $(PWD):/s -w /s/mtxrpicam_64 test_bookworm_64 bash -c "LD_LIBRARY_PATH=. TEST=1 ./exe"
+	docker run --rm --platform=linux/arm64/v8 -v $(PWD):/s -w /s/build/mtxrpicam_64 test_bookworm_64 bash -c "LD_LIBRARY_PATH=. TEST=1 ./mtxrpicam"