wip

Author: Ubuntu

.gitignore

@@ -1,6 +1,7 @@
 # mkosi artifacts
 
 build/
+build.*/
 env.json
 mkosi.builddir/
 mkosi.cache/

Makefile

@@ -50,6 +50,38 @@ build-dev: check-perms setup ## Build module with development tools
 
 ##@ Utilities
 
+check-repro: ## Build same module twice and compare resulting images
+	@rm -rf build.1
+	@rm -rf build.2
+
+	@rm -rf build/* mkosi.builddir/* mkosi.cache/* mkosi.packages/*
+	@sleep 5
+
+	@echo "Building image #1..."
+	$(WRAPPER) mkosi --force -I $(IMAGE).conf
+	@cp -r build build.1
+
+	@rm -rf build/* mkosi.builddir/* mkosi.cache/* mkosi.packages/*
+	@sleep 5
+
+	@echo "Building image #2..."
+	$(WRAPPER) mkosi --force -I $(IMAGE).conf
+	@cp -r build build.2
+
+	@echo "Comparing..."
+
+	@echo ""
+	@sha256sum build.1/tdx-debian.vmlinuz
+	@sha256sum build.2/tdx-debian.vmlinuz
+
+	@echo ""
+	@sha256sum build.1/tdx-debian.initrd
+	@sha256sum build.2/tdx-debian.initrd
+
+	@echo ""
+	@sha256sum build.1/tdx-debian.efi
+	@sha256sum build.2/tdx-debian.efi
+
 measure: ## Export TDX measurements for the built EFI file
 	@if [ ! -f build/tdx-debian.efi ]; then \
 		echo "Error: build/tdx-debian.efi not found. Run 'make build' first."; \

kernel/mkosi.build

@@ -15,9 +15,20 @@ if [[ -n "${KERNEL_CONFIG_SNIPPETS:-}" ]]; then
     IFS=',' read -ra snippets <<< "$KERNEL_CONFIG_SNIPPETS"
     for snippet in "${snippets[@]}"; do
         snippet_file="$SRCDIR/$snippet"
-        [[ -f "$snippet_file" ]] && cat "$snippet_file" >> "$config_file"
+        if [[ -f "$snippet_file" ]]; then
+            cat "$snippet_file" >> "$config_file" || true
+        fi
     done
 fi
+for snippets_var in "${!KERNEL_CONFIG_SNIPPETS_@}"; do
+    IFS=',' read -ra snippets <<< "${!snippets_var}"
+    for snippet in "${snippets[@]}"; do
+        snippet_file="$SRCDIR/$snippet"
+        if [[ -f "$snippet_file" ]]; then
+            cat "$snippet_file" >> "$config_file" || true
+        fi
+    done
+done
 
 # Calculate cache key and paths
 config_hash=$(sha256sum "$config_file" | cut -d' ' -f1 | cut -c1-12)
@@ -43,6 +54,9 @@ else
     mkosi-chroot --chdir "/build/kernel-${KERNEL_VERSION}" make olddefconfig
     mkosi-chroot --chdir "/build/kernel-${KERNEL_VERSION}" make -j "$(nproc 2>/dev/null || echo 2)" bzImage ARCH=x86_64 CONFIG_EFI_STUB=y
 
+    echo "# kernel config:"
+    mkosi-chroot --chdir "/build/kernel-${KERNEL_VERSION}" cat .config
+
     # Cache result
     mkdir -p "$cache_dir"
     cp arch/x86_64/boot/bzImage "$cache_dir/"

l2/kernel.config

@@ -1,3 +1 @@
-CONFIG_NET_VENDOR_GOOGLE=y
-CONFIG_GVE=y
 CONFIG_XFS_FS=y

l2/mkosi.conf

@@ -5,7 +5,7 @@ Include=base/mkosi.conf
 Profiles=gcp
 
 [Build]
-Environment=KERNEL_CONFIG_SNIPPETS=kernel/snippets/ubuntu.config,l2/kernel.config
+Environment=KERNEL_CONFIG_SNIPPETS_L2=kernel/snippets/ubuntu.config,l2/kernel.config
 WithNetwork=true
 
 [Content]

mkosi.profiles/gcp/kernel.config

@@ -0,0 +1,2 @@
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=y

mkosi.profiles/gcp/mkosi.conf

@@ -1,3 +1,6 @@
+[Build]
+Environment=KERNEL_CONFIG_SNIPPETS_GCP=mkosi.profiles/gcp/kernel.config
+
 [Content]
 ExtraTrees=mkosi.extra