Fix support for ICT based usb creation (#110)

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

Author: rranjan3

Makefile

@@ -130,6 +130,37 @@ build: check-proxy check-docker build-base
 	@echo "Preparing USB Installation Artifacts (containerized in Ubuntu 24.04)"
 	@set -a; . $(PROXY_FILE) 2>/dev/null || true; set +a; \
 	cd $(dir $(abspath $(firstword $(MAKEFILE_LIST)))) && \
+	ICT_MOUNT_ARGS=""; \
+	CONTAINER_ICT_IMG=""; \
+	if [ "$(MODE)" = "image-from-tool" ]; then \
+		if [ -z "$(ICT_IMG)" ]; then \
+			echo "ERROR: MODE=image-from-tool requires ICT_IMG=/path/to/image.raw.gz" >&2; \
+			echo "Example: make build MODE=image-from-tool ICT_IMG=/home/user/images/minimal-desktop-ubuntu-24.04.raw.gz" >&2; \
+			exit 1; \
+		fi; \
+		case "$(ICT_IMG)" in \
+			/*) ICT_ABS="$(ICT_IMG)" ;; \
+			*)  ICT_ABS="$$(readlink -m "$(ICT_IMG)")" ;; \
+		esac; \
+		ICT_DIR="$$(dirname "$$ICT_ABS")"; \
+		ICT_BASE="$$(basename "$$ICT_ABS")"; \
+		case "$$ICT_BASE" in \
+			*.raw.gz|*.raw.img.gz) ;; \
+			*) echo "ERROR: ICT_IMG must end in .raw.gz or .raw.img.gz (got: $$ICT_BASE)" >&2; exit 1;; \
+		esac; \
+		if [ ! -f "$$ICT_ABS" ] && [ ! -r "$$ICT_ABS" ]; then \
+			if ! sudo test -f "$$ICT_ABS"; then \
+				echo "ERROR: ICT_IMG not found on host: $$ICT_ABS" >&2; \
+				echo "Hint: ICT typically writes images under ~/ict/builds or ~/ict/workspace as root when built with 'sudo -E ./image-composer-tool build'." >&2; \
+				exit 1; \
+			fi; \
+			echo "Note: ICT_IMG is root-owned; container (privileged) will read it via bind mount."; \
+		fi; \
+		ICT_MOUNT_ARGS="-v $$ICT_DIR:/ict-image-src:ro"; \
+		CONTAINER_ICT_IMG="/ict-image-src/$$ICT_BASE"; \
+		echo "ICT image (host):      $$ICT_ABS"; \
+		echo "ICT image (container): $$CONTAINER_ICT_IMG"; \
+	fi; \
 	echo "Building orchestrator image: $(BUILD_ARTIFACTS_IMAGE)"; \
 	docker build \
 		--build-arg http_proxy="$${http_proxy:-}" \
@@ -157,8 +188,9 @@ build: check-proxy check-docker build-base
 		-e HOST_GID="$$(id -g)" \
 		-v "$$PWD":/workspace \
 		-v /var/run/docker.sock:/var/run/docker.sock \
+		$$ICT_MOUNT_ARGS \
 		$(BUILD_ARTIFACTS_IMAGE) \
-		"$(MODE)" "$(ICT_IMG)"
+		"$(MODE)" "$$CONTAINER_ICT_IMG"
 	@echo "---END MAKEFILE Build---"
 
 lint: shellcheck

README.md

@@ -102,14 +102,20 @@ Use the `image-from-tool` mode when you already have an image generated by Image
 make build MODE=image-from-tool ICT_IMG=/absolute/path/to/minimal-desktop-ubuntu-24.04.raw.gz
 ```
 
+`ICT_IMG` may point to any readable file on the host (absolute or relative to `$PWD`); it does not have to live inside the repository. `make` resolves the path, bind-mounts the containing directory read-only into the build container, and stages the image into `infrastructure/build-artifacts/` for packaging.
+
 The following are the supported Image Composer Tool image extensions:
 - `.raw.gz`
 - `.raw.img.gz`
 
-Example:
+Examples:
 
 ```bash
+# Absolute path anywhere on the host
 make build MODE=image-from-tool ICT_IMG=/home/user/images/minimal-desktop-ubuntu-24.04.raw.gz
+
+# Path relative to the repository root
+make build MODE=image-from-tool ICT_IMG=./minimal-desktop-ubuntu-24.04.raw.gz
 ```
 
 Build output:

docs/user-guide/how-to/advanced-image-customization.md

@@ -171,6 +171,11 @@ cd ../edge-node-infrastructure-blueprint
 make build MODE=image-from-tool ICT_IMG=/absolute/path/to/minimal-desktop-ubuntu-24.04.raw.gz
 ```
 
+`ICT_IMG` may be any readable file on the host — absolute path or path relative to
+the repository root. `make` resolves the path and bind-mounts the containing
+directory read-only into the build container, so the image does not need to live
+inside the repository.
+
 Example:
 
 ```bash

infrastructure/build-artifacts/build-installation-artifacts.sh

@@ -181,7 +181,7 @@ if eval "$tar_cmd" > /dev/null; then
         echo "##############################################################################################"
         echo "                                                                                              "
         echo "                                                                                              "
-        echo "USB Installation files--> usb-installation-files.tar.gz created successfully, under $(pwd)"
+        echo "USB Installation files--> usb-installation-files.tar.gz created successfully, under infrastructure/build-artifacts/out"
         echo "                                                                                              "
         echo "                                                                                              "
         echo "###############################################################################################"
@@ -200,30 +200,34 @@ popd > /dev/null || exit 1
 }
 
 # Use a pre-built ICT image as the OS image
+# The Makefile bind-mounts the host directory containing ICT_IMG at /ict-image-src
+# and passes /ict-image-src/<basename> as ICT_IMG to this script.
 use-ict-image(){
 
 if [ -z "$ICT_IMG" ]; then
-    echo "ICT_IMG is not provided."
+    echo "ERROR: ICT_IMG is not provided."
     echo "Usage: make build MODE=image-from-tool ICT_IMG=/path/to/image.raw.gz"
     exit 1
 fi
 
 if [ ! -f "$ICT_IMG" ]; then
-    echo "ICT image not found: $ICT_IMG"
+    echo "ERROR: ICT image not found inside container at: $ICT_IMG"
+    echo "The Makefile bind-mounts the host directory containing ICT_IMG at /ict-image-src."
+    echo "If you invoked the script directly (not via 'make build'), ensure ICT_IMG is a path visible inside this container."
     exit 1
 fi
 
 if ! [[ "$ICT_IMG" =~ \.(raw\.gz|raw\.img\.gz)$ ]]; then
-    echo "Error: ICT image must have a .raw.gz or .raw.img.gz extension"
+    echo "ERROR: ICT image must have a .raw.gz or .raw.img.gz extension (got: $ICT_IMG)"
     exit 1
 fi
 
 os_filename=$(basename "$ICT_IMG")
-cp "$ICT_IMG" .
-if [ "$?" -eq 0 ]; then
-    echo "ICT image ready: $os_filename"
+echo "Using ICT image: $ICT_IMG ($(du -h "$ICT_IMG" | awk '{print $1}'))"
+if cp "$ICT_IMG" .; then
+    echo "ICT image staged for packaging: $os_filename"
 else
-    echo "Failed to copy ICT image, please check!"
+    echo "ERROR: Failed to copy ICT image into build-artifacts directory."
     exit 1
 fi