update to last changes

build.sh

@@ -35,41 +35,17 @@ if [ "$EUID" -ne 0 ]; then
 fi
 
 echo "Starting ISO build..."
-lb build 2>&1 | tee build.log
+echo "Running lb config..."
+lb config 2>&1 | tee -a build.log
+echo "Running lb build..."
+lb build 2>&1 | tee -a build.log
 
-# Check for build errors in the log instead of relying on exit code
-if grep -q "E:.*failure occurred" build.log; then
-    echo "DEBUG: Build failed based on log content"
-    # Check if the error is about missing devuan-keyring
-    if grep -q "Couldn't find these debs: devuan-keyring" build.log; then
-        echo "DEBUG: Detected missing devuan-keyring error"
-        echo "Detected missing devuan-keyring. Downloading locally..."
-        if apt-get download devuan-keyring 2>&1 | tee -a build.log; then
-            echo "DEBUG: apt-get download succeeded"
-            echo "devuan-keyring downloaded successfully. Retrying build..."
-            rm -f build.log
-            echo "DEBUG: Starting retry build..."
-            lb build 2>&1 | tee build_retry.log
-            # Check retry log for errors
-            if grep -q "E:.*failure occurred" build_retry.log; then
-                echo "Build failed again. Check build_retry.log for errors."
-                exit 1
-            else
-                echo "Build completed successfully!"
-                echo "ISO file: $(ls live-image-amd64.iso 2>/dev/null || ls *.iso 2>/dev/null || echo 'Not found')"
-                exit 0
-            fi
-        else
-            echo "DEBUG: apt-get download failed"
-            echo "Failed to download devuan-keyring. Build cannot continue."
-            exit 1
-        fi
-    else
-        echo "DEBUG: Error is not about devuan-keyring"
-        echo "Build failed. Check build.log for errors."
-        exit 1
-    fi
-else
+BUILD_EXIT_CODE=$?
+
+if [ $BUILD_EXIT_CODE -eq 0 ]; then
     echo "Build completed successfully!"
     echo "ISO file: $(ls live-image-amd64.iso 2>/dev/null || ls *.iso 2>/dev/null || echo 'Not found')"
+else
+    echo "Build failed. Check build.log for errors."
+    exit 1
 fi
\ No newline at end of file

chroot/debootstrap/debootstrap.log

-2025-09-01 12:02:30 URL:http://deb.debian.org/debian/dists/testing/InRelease [146391/146391] -> "/working/mlivecd/chroot/var/lib/apt/lists/partial/deb.debian.org_debian_dists_testing_InRelease" [1]
-gpgv: Signature made Mon Sep  1 10:14:58 2025 SAST
-gpgv:                using RSA key 4CB50190207B4758A3F73A796ED0E7B82643E131
-gpgv: Can't check signature: No public key
-gpgv: Signature made Mon Sep  1 10:15:01 2025 SAST
-gpgv:                using RSA key B8E5F13176D2A7A75220028078DBA3BC47EF2265
-gpgv: Can't check signature: No public key
-gpgv: Signature made Mon Sep  1 10:14:58 2025 SAST
-gpgv:                using RSA key 4CB50190207B4758A3F73A796ED0E7B82643E131
-gpgv: Can't check signature: No public key
-gpgv: Signature made Mon Sep  1 10:15:01 2025 SAST
-gpgv:                using RSA key B8E5F13176D2A7A75220028078DBA3BC47EF2265
-gpgv: Can't check signature: No public key

chroot/var/lib/apt/lists/deb.debian.org_debian_dists_testing_Release.gpg

------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEETLUBkCB7R1ij9zp5btDnuCZD4TEFAmi1VgIACgkQbtDnuCZD
-4THSjBAAsFMdiByYh4n8buYulcMDVo+oNqUkTAYTe+lIhjulmP/Rs671PF7KKPz4
-g/yichTrgrm623ozAwNXy5SPjBNUX2D4LOOJFnDZEztBxtlL12XO1gVuWK2PRc7Y
-Rxf05QNDXv8/X5bj4YZmmhNGa5nLoxtQGAe20NikAVy/t7jRgOEFVVTn/4xssGmd
-cP3wKgCbvRR62O+DNmmXgJ1BcHVbb6TSCDX1iMYa1aPuXFfR4GAvQsDryG0oyfqG
-I1VgrE6HzoW1BnOaiC4k+Be5I2W1Zg1Wofe77u8jL2lbz4HaHMDXD1QM83NHsXi5
-Rg1GUvlw56P8dNT5cwCn8gQJoyUpyVKEn+84+nzmPxbm/5Zhd6SQfGw/EyIuGwf1
-QKClNWm2bXGX2YRsA0PK5sb9mBh1HLBM2yvGN8Y9sQnWifklk9b4sKQ0l6CbYljm
-un3jkoBUOGEFq7qOO+9sf6J6ybPjQNe++2Sx5c7V561Uw5iJQEjds3AO6imEv9sh
-RFB+siwqIEwcBWjBbw79SreFtt4GfoAWfXLFuza9ydIlWOUxm5YuqBdMXfQkHitT
-q1QgufOqt0uZuHxDTPFH6/ghPtVW6yRAqtx3zH+tYhAFuckdBWgQkixcEAC2spO+
-DwKlXzYgpBfxl8UTDy6cK7SC+n7c/AEBE32810r5iIlYM2Rp9y6JAjMEAQEIAB0W
-IQS45fExdtKnp1IgAoB426O8R+8iZQUCaLVWBQAKCRB426O8R+8iZZWFD/4u7rvL
-8qRvjypDaJrFBrUCKNpnYFE2Wzs3fM43R0wXVwXlCWVU2a6RDl2gQ/nE3ia/IB0D
-rrpWloyJZDVEMHazapj+7jEJks7aNKs2+7f1VCm80ze5vhfqvDL7Cw/zFEZ3/Jao
-ZTn52nvjwm8bV3pVhN3UfwUCBklqN9USYqt0xqTY0GGAsu6Wj2QxyRJCKRZ3QvmK
-n4OAjM96e2OAjmoFKArlt3m4A/IHP8hwthcooUmh363JSuctjwG1329WbhBf9Lp5
-Cb6c/WopJfINIK8wpnX5papg219wjegBe/rUfkXYbRcA+tbg+PqzH6xO1GWjHppT
-cfYi+tnaqYL9ZzhZ26SKb78EiDLNtFeZteoR4orUs9FXQEg0l/m1OLfIltr+TuW2
-yhNE8TmQMb+H/W0Sl8AOKerENWFIBz8Ldhq4iCHlsvxY5h9APNO8Cros1evsS6Zh
-3noGUeBCRjix8gAFhjr1RWCezoqD2nuxepdzk4rK5XbVuG31i5qc6fULUpr01AgT
-v0xoKV7wytuG2uVGcHZn5GbNUqbHSEZjCbJHT31uPjIeCvu35j11+IHwdg7xWDVQ
-RGmSKKd87xzE5igjXh+/Gfs1DYMYimX0GYCkfRlWAHgIGSbWE3kepQga257fDXdo
-l1qozdoWaDvrm52UzlDocpzBFVyvJ3eAz0wBdw==
-=AYkX
------END PGP SIGNATURE-----

config/bootstrap

@@ -22,7 +22,7 @@ LB_DISTRIBUTION_BINARY="testing"
 LB_PARENT_DISTRIBUTION_BINARY="testing"
 
 # Select parent distribution for debian-installer to use
-LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION=""
+LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="testing"
 
 # Select archive areas to use
 LB_ARCHIVE_AREAS="main"
@@ -66,9 +66,6 @@ LB_MIRROR_BINARY_SECURITY="http://packages.devuan.org/merged/"
 # Set debian-installer mirror
 LB_MIRROR_DEBIAN_INSTALLER="http://packages.devuan.org/merged/"
 
-# Set options to use with debootstrap
-DEBOOTSTRAP_OPTIONS="--keyring=/usr/share/keyrings/devuan-archive-keyring.gpg"
-
 # Set architectures to use foreign bootstrap
 LB_BOOTSTRAP_QEMU_ARCHITECTURE=""
 

config/common

@@ -64,7 +64,7 @@ APT_OPTIONS="--yes -o Acquire::Retries=5"
 APTITUDE_OPTIONS="--assume-yes -o Acquire::Retries=5"
 
 # Set options to use with debootstrap
-DEBOOTSTRAP_OPTIONS=""
+DEBOOTSTRAP_OPTIONS="--keyring=/usr/share/keyrings/devuan-archive-keyring.gpg"
 
 # Set script to use with debootstrap
 DEBOOTSTRAP_SCRIPT=""

custom-debootstrap

-#!/bin/bash
-
-# Custom debootstrap script that forces Debian keyring usage
-# This ensures that when building Debian images on Devuan hosts,
-# the correct keyring is used for package verification
-
-echo "Custom debootstrap with Debian keyring..."
-
-# Call the original debootstrap with explicit Debian keyring
-exec /usr/sbin/debootstrap --keyring=/usr/share/keyrings/debian-archive-keyring.gpg "$@"
\ No newline at end of file