Add archives/security.list.chroot

Reviewed-on: deepend/lb-config#1

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
 - name: build_img
-  image: debian:buster
+  image: debian:bookworm
   privileged: true
   volumes:
   - name: builds
@@ -27,7 +27,7 @@ steps:
   - lb build 
   - mv live-image-amd64.img /tl-builds/tildelinux.img
 - name: sha512sum
-  image: debian:buster
+  image: debian:bookworm
   privileged: true
   volumes:
   - name: builds
@@ -59,7 +59,7 @@ clone:
 
 steps:
 - name: build_img
-  image: debian:buster
+  image: debian:bookworm
   privileged: true
   volumes:
   - name: builds
@@ -79,7 +79,7 @@ steps:
   - lb build 
   - mv live-image-amd64.img /tl-builds/testing/tildelinux-testing.img
 - name: build_img_nopersist
-  image: debian:buster
+  image: debian:bookworm
   privileged: true
   volumes:
   - name: builds
@@ -100,11 +100,11 @@ steps:
   - lb build 
   - mv live-image-amd64.img /tl-builds/testing/tildelinux-testing-nopersistence.img
 - name: sha512sum
-  image: debian:buster
+  image: debian:bookworm
   privileged: true
   volumes:
   - name: builds
-    path: /tl-builds
+    path: /tl-builds/testing
   commands:
   - cd /tl-builds/testing
   - sha512sum *.img > SHA512SUMS
@@ -120,4 +120,4 @@ volumes:
     path: /proc
 - name: pts
   host:
-    path: /dev/pts
+    path: /dev/pts

archives/security.list.chroot

@@ -0,0 +1,2 @@
+deb http://security.debian.org/debian-security bookworm-security main contrib non-free
+deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free

archives/updates.list.chroot

@@ -0,0 +1,2 @@
+deb http://deb.debian.org/debian/ bookworm main contrib non-free
+deb-src http://deb.debian.org/debian/ bookworm main contrib non-free

binary

@@ -26,7 +26,7 @@ LB_BOOTLOADERS="syslinux"
 
 # $LB_CHECKSUMS: set checksums
 # (Default: md5)
-LB_CHECKSUMS="md5"
+LB_CHECKSUMS="sha256"
 
 # $LB_COMPRESSION: set compression
 # (Default: none)
@@ -43,11 +43,11 @@ LB_BUILD_WITH_CHROOT="true"
 
 # $LB_DEBIAN_INSTALLER: set debian-installer
 # (Default: false)
-LB_DEBIAN_INSTALLER="false"
+LB_DEBIAN_INSTALLER="none"
 
 # $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
 # (Default: empty)
-LB_DEBIAN_INSTALLER_DISTRIBUTION="buster"
+LB_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
 
 # $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
 # (Default: )
@@ -79,7 +79,7 @@ LB_ISO_APPLICATION="Tildelinux Live"
 
 # $LB_ISO_PREPARER: set iso preparer
 # (Default: live-build 1:20190311; https://debian-live.alioth.debian.org/live-build)
-LB_ISO_PREPARER="live-build 1:20190311; https://debian-live.alioth.debian.org/live-build"
+LB_ISO_PREPARER="live-build 1:20230315; https://debian-live.alioth.debian.org/live-build"
 
 # $LB_ISO_PUBLISHER: set iso publisher
 # (Default: Tildelinux Project; https://tildegit.org/tildelinux; tildelinux@tildeverse.org)

bootstrap

@@ -1,16 +1,16 @@
 # config/bootstrap - options for live-build(7), bootstrap stage
 
 # $LB_DISTRIBUTION: select distribution to use
-# (Default: buster)
-LB_DISTRIBUTION="buster"
+# (Default: bookworm)
+LB_DISTRIBUTION="bookworm"
 
 # $LB_PARENT_DISTRIBUTION: select parent distribution to use
-# (Default: buster)
-LB_PARENT_DISTRIBUTION="buster"
+# (Default: bookworm)
+LB_PARENT_DISTRIBUTION="bookworm"
 
 # $LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION: select parent distribution for debian-installer to use
-# (Default: buster)
-LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="buster"
+# (Default: bookworm)
+LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
 
 # $LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
 # (Default: http://deb.debian.org/debian/)

build

@@ -1,10 +1,10 @@
 [Image]
 Architecture: amd64
-Archive-Areas: main contrib non-free
-Distribution: buster
+Archive-Areas: main contrib non-free non-free-firmware
+Distribution: bookworm
 Mirror-Bootstrap: http://deb.debian.org/debian/
 
-[FIXME]
-Configuration-Version: 1:20190311
+[Configuration]
+Configuration-Version: 1:20230315  # Updated to a more recent configuration version
 Name: live-image
-Type: hdd
+Type: hdd

chroot

@@ -13,25 +13,25 @@ LB_UNION_FILESYSTEM="overlay"
 LB_INTERACTIVE="false"
 
 # $LB_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
+# (Updated for Debian 12)
 LB_KEYRING_PACKAGES="debian-archive-keyring"
 
 # $LB_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
+# (Adjusted for Debian 12, default is amd64 if on an amd64 system)
 LB_LINUX_FLAVOURS="amd64"
 
 # $LB_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LB_LINUX_PACKAGES="linux-image"
+# (Adjusted for Debian 12 to ensure the correct kernel is used)
+LB_LINUX_PACKAGES="linux-image-amd64"
 
 # $LB_SECURITY: enable security updates
-# (Default: true)
+# (Default: true, ensuring security updates are enabled)
 LB_SECURITY="true"
 
 # $LB_UPDATES: enable updates updates
-# (Default: true)
+# (Default: true, ensures regular updates are applied)
 LB_UPDATES="true"
 
 # $LB_BACKPORTS: enable backports updates
-# (Default: false)
+# (Default: false, enable if needed for newer packages on stable release)
 LB_BACKPORTS="false"

common

@@ -34,7 +34,7 @@ LB_CACHE="true"
 
 # $LB_CACHE_INDICES: control if downloaded package indices should be cached
 # (Default: false)
-LB_CACHE_INDICES="false"
+LB_CACHE_INDICES="true"  # Consider changing to true for repeated builds to save bandwidth and time.
 
 # $LB_CACHE_PACKAGES: control if downloaded packages files should be cached
 # (Default: true)
@@ -88,19 +88,19 @@ LB_TASKSEL="apt"
 
 # $_BREAKPOINTS: enable breakpoints
 # (Default: false)
-#_BREAKPOINTS="false"
+_BREAKPOINTS="false"
 
 # $_DEBUG: enable debug
 # (Default: false)
-#_DEBUG="false"
+_DEBUG="false"
 
 # $_COLOR: enable color
 # (Default: false)
-#_COLOR="false"
+_COLOR="false"
 
 # $_FORCE: enable force
 # (Default: false)
-#_FORCE="false"
+_FORCE="false"
 
 # $_QUIET: enable quiet
 # (Default: false)
@@ -108,7 +108,7 @@ _QUIET="false"
 
 # $_VERBOSE: enable verbose
 # (Default: false)
-#_VERBOSE="false"
+_VERBOSE="false"
 
 # Internal stuff (FIXME)
 APT_OPTIONS="--yes"

hooks/live/0060-configure-syslinux-efi.hook.binary

@@ -1,7 +1,33 @@
 #!/bin/sh
 echo "Configuring Syslinux EFI bootloader..."
+
+# Ensure the target directory for the bootloader exists
 mkdir -p "EFI/BOOT"
-cp "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" "EFI/BOOT/BOOTX64.efi"
-cp "/usr/lib/syslinux/modules/efi64/"* "EFI/BOOT"
-cp "syslinux/"*.cfg "EFI/BOOT"
-cp "syslinux/splash.png" "EFI/BOOT"
+
+# Copy the Syslinux EFI bootloader to the target directory.
+# Check the path for the syslinux.efi file as it might differ between distributions.
+if [ -f "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" ]; then
+    cp "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" "EFI/BOOT/BOOTX64.efi"
+else
+    echo "Syslinux EFI bootloader not found, check installation."
+    exit 1
+fi
+
+# Copy all Syslinux modules for EFI. Update the path if necessary.
+if [ -d "/usr/lib/syslinux/modules/efi64/" ]; then
+    cp "/usr/lib/syslinux/modules/efi64/"* "EFI/BOOT"
+else
+    echo "Syslinux modules not found, check installation."
+    exit 1
+fi
+
+# Copy configuration files and splash image. Adjust these file locations if your structure differs.
+if [ -d "syslinux/" ] && [ -f "syslinux/splash.png" ]; then
+    cp "syslinux/"*.cfg "EFI/BOOT"
+    cp "syslinux/splash.png" "EFI/BOOT"
+else
+    echo "Syslinux configuration files or splash image not found."
+    exit 1
+fi
+
+echo "Syslinux EFI configuration completed successfully."

package-lists/base.list.chroot

@@ -4,7 +4,6 @@ network-manager
 tmux
 weechat
 ssh
-firmware-linux
 sshfs
 git
 curl

readme.md

@@ -1,7 +1,6 @@
 # lb-config
-[![Build Status](https://drone.tildelinux.org/api/badges/tildelinux/lb-config/status.svg)](https://drone.tildelinux.org/tildelinux/lb-config)
+[![Build Status](https://drone.tildegit.org/api/badges/deepend/lb-config/status.svg)](https://drone.tildegit.org/deepend/lb-config)
 
-latest successfuly built image [here](https://drone.tildelinux.org/builds/tildelinux)
 
 live-build chroot and config files for tildelinux
 
@@ -12,7 +11,7 @@ this is where the magic happens
 2. `mkdir tildelinux && cd tildelinux`
 3. `lb config`
 4. `rm -r config`
-5. `git clone --recurse-submodules https://tildegit.org/tildelinux/lb-config/ config`
+5. `git clone --recurse-submodules https://tildegit.org/deepend/lb-config/ config`
 6. `lb build`
 7. The image file will be named 'live-image-amd64.img'