Merge pull request #185 from lool/apt-fixes

APT fixes

Author: lool

README.md

@@ -129,7 +129,7 @@ A few options are provided in the debos recipes; for the root filesystem recipe:
 For the image recipe:
 - `dtb`: override the firmware provided device tree with one from the linux kernel, e.g. `qcom/qcs6490-rb3gen2.dtb`; default: don't override
 - `imagetype`: either `ufs` (the default) or (`sdcard`); UFS images are named disk-ufs.img and use 4096 bytes sectors and SD card images are named disk-sdcard.img and use 512 bytes sectors
-- `imagesize`: set the output disk image size; default: `4GiB`
+- `imagesize`: set the output disk image size; default: `4.5GiB`
 
 For the flash recipe:
 - `u_boot_rb1`: prebuilt U-Boot binary for RB1 in Android boot image format -- see below (NB: debos expects relative pathnames)

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/overlays/backports/etc/apt/preferences.d/debian-backports.pref

@@ -0,0 +1,6 @@
+# for binary packages built from these source packages, score the version from
+# Debian backports higher as to get hardware enabled or better hardware support
+
+Package: src:alsa-ucm-conf:any src:firmware-free:any src:firmware-nonfree:any src:linux:any src:linux-signed-arm64:any src:mesa:any
+Pin: release n=trixie-backports
+Pin-Priority: 900

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

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

debos-recipes/overlays/qsc-deb-releases/etc/apt/preferences.d/qsc-deb-releases.pref

@@ -0,0 +1,6 @@
+# for binary packages built from these source packages, score the version from
+# trixie-overlay higher than versions from Debian for compliance
+Package: src:pipewire:any
+Pin: release n=trixie-overlay
+Pin-Priority: 950
+

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

@@ -1,5 +1,5 @@
 {{- $dtb := or .dtb "firmware" }}
-{{- $imagesize := or .imagesize "4GiB" }}
+{{- $imagesize := or .imagesize "4.5GiB" }}
 {{- $imagetype := or .imagetype "ufs" }}
 {{- $image := printf "disk-%s.img" $imagetype }}
 

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

@@ -13,7 +13,8 @@ actions:
     suite: trixie
     components:
       - main
-      # for packages of linux-firmware
+      - contrib
+      - non-free
       - non-free-firmware
     mirror: http://deb.debian.org/debian
     variant: minbase
@@ -28,7 +29,7 @@ actions:
       mount --bind {{$aptlocalrepo}} "${ROOTDIR}/media/apt-local-repo"
 
   - action: run
-    description: APT update and upgrade with local APT repository
+    description: Setup APT sources for local APT repository
     chroot: true
     command: |
       set -eux
@@ -38,18 +39,18 @@ actions:
       Suites: /
       Trusted: true
       EOF
-
-      apt update
-      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
+
+  - action: overlay
+    description: Add Debian backports APT configuration
+    source: overlays/backports
 
 {{- if .overlays }}
 {{- range $overlay := split "," .overlays }}
@@ -59,6 +60,20 @@ 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
+      # install ca-certificates early to make sure https APT sources are
+      # properly picked up
+      apt -y install ca-certificates
+      # APT update and upgrade to pickup changes from overlays
+      apt -y update
+      apt -y full-upgrade
+
   - action: apt
     description: Install foundational packages
     recommends: true