fix(debos/rootfs): Add missing trixie suites

Add missing trixie-updates and trixie-security suites as these aren't
created by debootstrap by default. Run an APT update and full-upgrade
to pickup changes from these suites.

Signed-off-by: Loïc Minier <[email protected]>

Author: lool

debos-recipes/overlays/apt-sources/etc/apt/sources.list.d/debian.sources

@@ -0,0 +1,20 @@
+# Debian archive
+Types: deb
+URIs: http://deb.debian.org/debian/
+Suites: trixie
+Components: main contrib non-free non-free-firmware
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+# Debian stable updates
+Types: deb
+URIs: http://deb.debian.org/debian/
+Suites: trixie-updates
+Components: main contrib non-free non-free-firmware
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+# Debian security updates
+Types: deb
+URIs: http://deb.debian.org/debian-security/
+Suites: trixie-security
+Components: main contrib non-free non-free-firmware
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

debos-recipes/qualcomm-linux-debian-rootfs.yaml

@@ -43,13 +43,12 @@ actions:
       apt -y upgrade
 {{- end }}
 
-  - action: run
-    description: Modernize APT sources
-    chroot: true
-    command: |
-      set -eux
-      apt -y modernize-sources
-      rm -v /etc/apt/sources.list.bak
+  # after debootstrap, only a basic etc/apt/sources.list is created; add more
+  # modern etc/apt/sources.list.d/debian.sources; sources.list is removed after
+  # applying all overlays, and followed by an APT update and full-upgrade
+  - action: overlay
+    description: Create Debian APT sources
+    source: overlays/apt-sources
 
 {{- if .overlays }}
 {{- range $overlay := split "," .overlays }}
@@ -59,6 +58,17 @@ actions:
 {{- end }}
 {{- end }}
 
+  - action: run
+    description: Remove old APT sources and upgrade packages
+    chroot: true
+    command: |
+      set -eux
+      # remove old style, incomplete sources, superseded in apt-sources overlay
+      rm -vf /etc/apt/sources.list
+      # APT update and upgrade to pickup changes from overlays
+      apt -y update
+      apt -y full-upgrade
+
   - action: apt
     description: Install foundational packages
     recommends: true