From 252f230521bab440790f1060a18f85db52bd2da7 Mon Sep 17 00:00:00 2001
From: Tom Dewey <tom.dewey@raspberrypi.com>
Date: Wed, 22 Oct 2025 14:58:48 +0100
Subject: [PATCH] Implement bdebstrap installation from source in
 dependencies.sh

- Added a function to install bdebstrap from source into a Python virtual environment.
- Updated the depends file to reflect that bdebstrap is now installed from source.
- Included checks for existing installations and symlink creation for hooks.
- Automatically activates the bdebstrap virtual environment when sourcing dependencies.sh.

Signed-off-by: Tom Dewey <tom.dewey@raspberrypi.com>
---
 depends             |  2 +-
 lib/dependencies.sh | 77 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/depends b/depends
index 84b80ea4..525552e1 100644
--- a/depends
+++ b/depends
@@ -8,7 +8,7 @@ curl
 genimage
 mtools
 mmdebstrap
-bdebstrap
+# bdebstrap - installed from source in dependencies.sh
 podman
 zstd
 pv
diff --git a/lib/dependencies.sh b/lib/dependencies.sh
index c4991299..5733e949 100644
--- a/lib/dependencies.sh
+++ b/lib/dependencies.sh
@@ -1,5 +1,18 @@
 #!/bin/bash
 
+# activate_bdebstrap_venv
+# Adds the bdebstrap venv to PATH if it exists
+activate_bdebstrap_venv()
+{
+	local venv_path="/opt/rpi-image-gen/bdebstrap-venv"
+	if [[ -d "${venv_path}/bin" ]]; then
+		export PATH="${venv_path}/bin:${PATH}"
+	fi
+}
+
+# Call this automatically when sourcing this file
+activate_bdebstrap_venv
+
 # dependencies_check
 # $@	Dependency files to check
 #
@@ -69,10 +82,74 @@ dependencies_check()
 }
 
 
+install_bdebstrap_from_source()
+{
+	local venv_path="/opt/rpi-image-gen/bdebstrap-venv"
+	
+	echo "Installing bdebstrap from source to venv..."
+	
+	# Check if venv already exists and has bdebstrap
+	if [[ -f "${venv_path}/bin/bdebstrap" ]]; then
+		echo "bdebstrap venv already exists at ${venv_path}, skipping installation"
+		return 0
+	fi
+	
+	# Install dependencies for venv, git, and building bdebstrap
+	apt install -y git python3 python3-venv python3-pip pandoc
+	
+	# Create directory and venv with system site packages access
+	mkdir -p "$(dirname "${venv_path}")"
+	echo "Creating Python virtual environment at ${venv_path}..."
+	python3 -m venv --system-site-packages "${venv_path}"
+	
+	# Clone bdebstrap repository
+	local temp_dir=$(mktemp -d)
+	cd "$temp_dir"
+	
+	echo "Cloning bdebstrap repository..."
+	git clone https://github.com/bdrung/bdebstrap.git
+	cd bdebstrap
+	
+	# Install bdebstrap into venv using pip
+	echo "Installing bdebstrap into venv..."
+	"${venv_path}/bin/pip" install --upgrade pip
+	"${venv_path}/bin/pip" install .
+	
+	# Create symlink for hooks in the location bdebstrap expects
+	# bdebstrap calculates HOOKS_DIR as: Path(__file__).parent.parent / "share" / "bdebstrap" / "hooks"
+	# So for /opt/rpi-image-gen/bdebstrap-venv/bin/bdebstrap it expects /opt/rpi-image-gen/bdebstrap-venv/share/bdebstrap/hooks
+	local expected_hooks="${venv_path}/share/bdebstrap"
+	local actual_hooks=$(find "${venv_path}/lib" -type d -path "*/usr/share/bdebstrap" 2>/dev/null | head -n1)
+	
+	if [[ -n "${actual_hooks}" && -d "${actual_hooks}" ]]; then
+		echo "Creating hooks symlink at expected location..."
+		mkdir -p "${venv_path}/share"
+		ln -sf "${actual_hooks}" "${expected_hooks}"
+	else
+		>&2 echo "WARNING: Could not find bdebstrap hooks directory"
+	fi
+	
+	# Clean up
+	cd /
+	rm -rf "$temp_dir"
+	
+	# Verify installation
+	if [[ -f "${venv_path}/bin/bdebstrap" ]]; then
+		echo "bdebstrap successfully installed to ${venv_path}"
+	else
+		>&2 echo "ERROR: bdebstrap installation failed"
+		exit 1
+	fi
+}
+
 dependencies_install()
 {
 	if [ "$(id -u)" != "0" ]; then
 		>&2 echo "Please run as root to install dependencies."; exit 1
 	fi
+	
+	# Build and install bdebstrap from source first
+	install_bdebstrap_from_source
+	
 	dependencies_check install "$@"
 }