From 076d04cf06c4daeb7154bbaa740ff832a40282ef Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Fri, 17 Nov 2023 03:31:00 +0200 Subject: [PATCH] fixing disk config for new pi-builder --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21e48ff..f7c9d19 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ ROOT_PASSWD ?= root WEBUI_ADMIN_PASSWD ?= admin IPMI_ADMIN_PASSWD ?= admin +export DISK ?= $(shell pwd)/disk/$(word 1,$(subst -, ,$(PLATFORM))).conf export CARD ?= /dev/null export IMAGE_XZ ?= @@ -56,7 +57,6 @@ shell: $(_BUILDER_DIR) os: $(_BUILDER_DIR) rm -rf $(_BUILDER_DIR)/stages/arch/{pikvm,pikvm-otg-console} cp -a stages/arch/{pikvm,pikvm-otg-console} $(_BUILDER_DIR)/stages/arch - cp -L disk/$(word 1,$(subst -, ,$(PLATFORM))).conf $(_BUILDER_DIR)/disk.conf $(MAKE) -C $(_BUILDER_DIR) os \ BUILD_OPTS=' $(BUILD_OPTS) \ --build-arg PLATFORM=$(PLATFORM) \