refinements and following packaging best practices

Author: MoeMahhouk

Makefile

@@ -342,27 +342,9 @@ clean:
 	make -C $(EF_TESTS) clean
 	make -C $(STATE_TRANSITION_VECTORS) clean
 
-.PHONY: install-cargo-deb deb-cargo deb-cargo-x86_64 deb-cargo-aarch64 deb-cargo-all test-deb-reproducible install-deb-local remove-deb-local clean-deb help-deb
-## Install cargo-deb if not present
-install-cargo-deb:
-	@if ! command -v cargo-deb &> /dev/null; then \
-		echo "Installing cargo-deb..."; \
-		cargo install cargo-deb; \
-	else \
-		echo "cargo-deb already installed"; \
-	fi
-
-## Build .deb package using cargo-deb with reproducible settings
-deb-cargo: install-cargo-deb build-reproducible
+.PHONY: deb-cargo
+deb-cargo: build-reproducible ## Build .deb package using cargo-deb with reproducible settings
 	@echo "Building .deb package with cargo-deb..."
-	@if [ ! -f "lighthouse/lighthouse.service" ]; then \
-		echo "❌ lighthouse.service not found in lighthouse/ directory"; \
-		exit 1; \
-	fi
-	@if [ ! -f "README.md" ]; then \
-		echo "❌ README.md not found in current directory"; \
-		exit 1; \
-	fi
 
 	cd lighthouse && \
 	SOURCE_DATE_EPOCH=$(SOURCE_DATE) \
@@ -374,65 +356,26 @@ deb-cargo: install-cargo-deb build-reproducible
 	@echo "✅ Package built successfully!"
 	@find target/$(RUST_TARGET)/debian -name "*.deb" -exec ls -la {} \;
 
-## Build .deb for specific architectures
-deb-cargo-x86_64:
+
+.PHONY: deb-cargo-x86_64
+deb-cargo-x86_64: ## Build .deb for specific architectures
 	$(MAKE) deb-cargo RUST_TARGET=x86_64-unknown-linux-gnu
 
+.PHONY: deb-cargo-aarch64
 deb-cargo-aarch64:
 	$(MAKE) deb-cargo RUST_TARGET=aarch64-unknown-linux-gnu
 
+.PHONY: deb-cargo-all
 deb-cargo-all: deb-cargo-x86_64 deb-cargo-aarch64
 
-## Test reproducibility of cargo-deb packages
-test-deb-reproducible: 
-	@echo "Testing cargo-deb package reproducibility..."
-	@if ! command -v diffoscope &> /dev/null; then \
-		echo "Installing diffoscope..."; \
-		sudo apt-get update; \
-		sudo apt-get install -y diffoscope binutils-multiarch; \
-	fi
-	
-	@echo "Building first package..."
-	@rm -f lighthouse_*.deb lighthouse-deb-*.deb
-	@$(MAKE) clean || true
-	@$(MAKE) deb-cargo
-	@FIRST_PACKAGE=$$(find target/$(RUST_TARGET)/debian -name "*.deb" | head -1); \
-	if [ -n "$$FIRST_PACKAGE" ]; then \
-		cp "$$FIRST_PACKAGE" ./lighthouse-deb-build-1.deb; \
-	else \
-		echo "❌ First package not found"; exit 1; \
-	fi
-	
-	@echo "Building second package..."
-	@$(MAKE) clean || true
-	@$(MAKE) deb-cargo
-	@SECOND_PACKAGE=$$(find target/$(RUST_TARGET)/debian -name "*.deb" | head -1); \
-	if [ -n "$$SECOND_PACKAGE" ]; then \
-		cp "$$SECOND_PACKAGE" ./lighthouse-deb-build-2.deb; \
-	else \
-		echo "❌ Second package not found"; exit 1; \
-	fi
-	
-	@echo "Comparing packages..."
-	@echo "=== Package sizes ==="
-	@ls -la lighthouse-deb-build-*.deb
-	@echo "=== SHA256 checksums ==="
-	@sha256sum lighthouse-deb-build-*.deb
-	
-	@if cmp -s lighthouse-deb-build-1.deb lighthouse-deb-build-2.deb; then \
-		echo "✅ SUCCESS: cargo-deb packages are identical!"; \
-		echo "✅ Reproducible build PASSED"; \
-	else \
-		echo "❌ FAILED: cargo-deb packages differ"; \
-		echo "Running detailed analysis with diffoscope..."; \
-		diffoscope --text lighthouse-deb-build-1.deb lighthouse-deb-build-2.deb > cargo-deb-diff.txt || true; \
-		echo "Differences saved to cargo-deb-diff.txt"; \
-		echo "❌ Reproducible build FAILED"; \
-		exit 1; \
-	fi
 
-## Install .deb package locally for testing
-install-deb-local:
+.PHONY: test-deb-reproducible
+test-deb-reproducible: ## Test reproducibility of cargo-deb packages
+	@./scripts/test-deb-reproducible.sh $(RUST_TARGET)
+
+
+.PHONY: install-deb-local
+install-deb-local: ## Install .deb package locally for testing
 	@PACKAGE=$$(find target/$(RUST_TARGET)/debian -name "*.deb" | head -1); \
 	if [ -n "$$PACKAGE" ]; then \
 		echo "Installing lighthouse package: $$PACKAGE"; \
@@ -449,22 +392,23 @@ install-deb-local:
 		echo "❌ No .deb package found. Run 'make deb-cargo' first."; \
 	fi
 
-## Remove installed lighthouse package
-remove-deb-local:
+
+.PHONY: remove-deb-local
+remove-deb-local: ## Remove installed lighthouse package
 	@echo "Removing lighthouse package..."
 	sudo dpkg -r lighthouse || true
 	sudo systemctl daemon-reload || true
 
-## Clean up debian packaging artifacts
-clean-deb:
+.PHONY: clean-deb
+clean-deb: ## Clean up debian packaging artifacts
 	@echo "Cleaning up debian packaging artifacts..."
 	rm -f lighthouse_*.deb lighthouse-deb-*.deb *-diff.txt
 	rm -rf target/*/debian/
 
-## Show help for debian packaging
-help-deb:
+
+.PHONY: help-deb
+help-deb: ## Show help for debian packaging
 	@echo "Clean Debian Packaging Targets:"
-	@echo "  install-cargo-deb      - Install cargo-deb tool"
 	@echo "  deb-cargo              - Build .deb package with cargo-deb"
 	@echo "  deb-cargo-x86_64       - Build x86_64 .deb package"
 	@echo "  deb-cargo-aarch64      - Build aarch64 .deb package"

lighthouse/Cargo.toml

@@ -95,31 +95,24 @@ name = "lighthouse_tests"
 path = "tests/main.rs"
 
 [package.metadata.deb]
-# Package metadata
 maintainer = "Sigma Prime <[email protected]>"
 extended-description = """\
 Lighthouse is a Rust implementation of the Ethereum beacon chain, \
 built by Sigma Prime. It implements the official Ethereum 2.0 specification."""
 
-# Dependencies
 depends = "$auto, systemd"
 section = "net"
 priority = "optional"
+maintainer-scripts = "debian/"  # This tells cargo-deb where to find scripts
 
 # System integration
 systemd-units = { enable = false, start = false }
 
 # Assets to include in the package
 assets = [
-    # Binary - use target/release/ prefix (cargo-deb will replace with actual path)
     ["target/release/lighthouse", "usr/bin/", "755"],
-    
-    # Systemd service (in lighthouse directory)
-    ["lighthouse.service", "lib/systemd/system/", "644"],
-    
-    # Documentation (in parent directory)  
+    ["debian/lighthouse.service", "lib/systemd/system/", "644"],
     ["../README.md", "usr/share/doc/lighthouse/", "644"],
 ]
 
-# Use default features - let Makefile handle the building
 default-features = false

lighthouse/lighthouse.service renamed to lighthouse/debian/lighthouse.service

@@ -1,14 +1,12 @@
 [Unit]
-Description=Lighthouse Ethereum Beacon Chain Client
-Documentation=https://lighthouse-book.sigmaprime.io/
+Description=Lighthouse Ethereum Beacon Node
 After=network.target
 Wants=network.target
 
 [Service]
 Type=simple
-DynamicUser=true
 User=lighthouse
-Group=eth
+Group=lighthouse
 Restart=always
 RestartSec=5
 TimeoutStopSec=180

lighthouse/debian/postinst

@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+# Create lighthouse user if it doesn't exist
+if ! getent passwd lighthouse >/dev/null 2>&1; then
+    adduser --system --group --home /var/lib/lighthouse \
+            --shell /bin/false --gecos "Lighthouse Beacon Node" lighthouse
+fi
+
+# Create data directory
+mkdir -p /var/lib/lighthouse
+chown lighthouse:lighthouse /var/lib/lighthouse
+chmod 750 /var/lib/lighthouse
+
+# Create log directory  
+mkdir -p /var/log/lighthouse
+chown lighthouse:lighthouse /var/log/lighthouse
+chmod 750 /var/log/lighthouse
+
+# Reload systemd
+systemctl daemon-reload || true
+
+#DEBHELPER#
+
+exit 0

lighthouse/debian/postrm

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ]; then
+    # Remove user (optional - some prefer to keep it)
+    if getent passwd lighthouse >/dev/null 2>&1; then
+        deluser lighthouse || true
+    fi
+    
+    # Remove data directory (be careful!)
+    # rm -rf /var/lib/lighthouse || true
+    # rm -rf /var/log/lighthouse || true
+fi
+
+#DEBHELPER#
+
+exit 0

lighthouse/debian/prerm

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ]; then
+    # Stop service if running
+    systemctl stop lighthouse || true
+    systemctl disable lighthouse || true
+fi
+
+#DEBHELPER#
+
+exit 0

scripts/test-deb-reproducible.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+#
+# Test reproducibility of cargo-deb packages
+#
+# Usage: ./scripts/test-deb-reproducible.sh [RUST_TARGET]
+#
+# This script builds the same Debian package twice with clean builds in between,
+# then compares them to ensure reproducible builds are working correctly.
+
+set -euo pipefail
+
+# Default target if not provided
+RUST_TARGET="${1:-x86_64-unknown-linux-gnu}"
+
+echo "🔄 Testing cargo-deb package reproducibility for ${RUST_TARGET}..."
+
+# Check if diffoscope is available, install if needed
+if ! command -v diffoscope &> /dev/null; then
+    echo "📦 Installing diffoscope..."
+    sudo apt-get update
+    sudo apt-get install -y diffoscope binutils-multiarch
+fi
+
+# Clean up any existing test artifacts
+echo "🧹 Cleaning up previous test artifacts..."
+rm -f lighthouse_*.deb lighthouse-deb-*.deb *-diff.txt
+
+# Build first package
+echo "🔨 Building first package..."
+make clean || true
+make deb-cargo RUST_TARGET="${RUST_TARGET}"
+
+FIRST_PACKAGE=$(find target/"${RUST_TARGET}"/debian -name "*.deb" | head -1)
+if [ -n "$FIRST_PACKAGE" ]; then
+    cp "$FIRST_PACKAGE" ./lighthouse-deb-build-1.deb
+    echo "✅ First package built: $(basename "$FIRST_PACKAGE")"
+else
+    echo "❌ First package not found"
+    exit 1
+fi
+
+# Build second package  
+echo "🔨 Building second package..."
+make clean || true
+make deb-cargo RUST_TARGET="${RUST_TARGET}"
+
+SECOND_PACKAGE=$(find target/"${RUST_TARGET}"/debian -name "*.deb" | head -1)
+if [ -n "$SECOND_PACKAGE" ]; then
+    cp "$SECOND_PACKAGE" ./lighthouse-deb-build-2.deb
+    echo "✅ Second package built: $(basename "$SECOND_PACKAGE")"
+else
+    echo "❌ Second package not found"
+    exit 1
+fi
+
+# Compare packages
+echo "📊 Comparing packages..."
+echo ""
+echo "=== Package sizes ==="
+ls -lah lighthouse-deb-build-*.deb
+
+echo ""
+echo "=== SHA256 checksums ==="
+sha256sum lighthouse-deb-build-*.deb
+
+echo ""
+echo "=== Binary comparison ==="
+if cmp -s lighthouse-deb-build-1.deb lighthouse-deb-build-2.deb; then
+    echo "✅ SUCCESS: cargo-deb packages are identical!"
+    echo "✅ Reproducible build PASSED for ${RUST_TARGET}"
+    echo ""
+    echo "🧹 Cleaning up test artifacts..."
+    rm -f lighthouse-deb-build-*.deb
+    exit 0
+else
+    echo "❌ FAILED: cargo-deb packages differ"
+    echo "🔍 Running detailed analysis with diffoscope..."
+    
+    # Generate detailed diff report
+    DIFF_FILE="cargo-deb-diff-${RUST_TARGET}.txt"
+    if diffoscope --text lighthouse-deb-build-1.deb lighthouse-deb-build-2.deb > "$DIFF_FILE" 2>/dev/null; then
+        echo "📄 Differences saved to ${DIFF_FILE}"
+        echo "📄 Summary of first few differences:"
+        head -20 "$DIFF_FILE" || true
+    else
+        echo "⚠️  diffoscope encountered issues, but differences were detected"
+    fi
+    
+    echo ""
+    echo "❌ Reproducible build FAILED for ${RUST_TARGET}"
+    echo "💡 Tip: Check the diff file for details on what differs between builds"
+    exit 1
+fi