Merge pull request #137 from lool/trixie-fixes

trixie fixes

Author: lool

.github/workflows/debos.yml

@@ -91,7 +91,6 @@ jobs:
           set -ux
           debos \
               -t overlays:'${{ inputs.overlays }}' \
-              -t experimentalkernel:true \
               -t xfcedesktop:true \
               -t aptlocalrepo:${PWD}/local-apt-repo \
               -t kernelpackage:'${{ inputs.kernelpackage }}' \

README.md

@@ -123,7 +123,6 @@ debos --fakemachine-backend qemu --memory 1GiB --scratchsize 4GiB debos-recipes/
 ### Options for debos recipes
 
 A few options are provided in the debos recipes; for the root filesystem recipe:
-- `experimentalkernel`: update the linux kernel to the version from experimental; default: don't update the kernel
 - `localdebs`: path to a directory with local deb packages to install (NB: debos expects relative pathnames)
 - `xfcedesktop`: install a Xfce desktop environment; default: console only environment
 

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

@@ -1,5 +1,4 @@
 {{- $xfcedesktop := or .xfcedesktop "false" }}
-{{- $experimentalkernel := or .experimentalkernel "false" }}
 {{- $localdebs := or .localdebs "none" }}
 {{- $aptlocalrepo := or .aptlocalrepo "none" }}
 {{- $kernelpackage := or .kernelpackage "linux-image-arm64" }}
@@ -246,53 +245,6 @@ actions:
       - firmware-qcom-soc
       - {{$kernelpackage}}
 
-  # XXX this is a workaround until firmware-non-free migrates to testing; it
-  # might make sense to have a generic mechanism to do this
-  - action: run
-    description: Install firmware packages from unstable
-    chroot: true
-    command: |
-      set -eux
-      # add sid APT sources
-      cat >/etc/apt/sources.list.d/debian-sid.sources <<EOF
-      Types: deb
-      URIs: http://deb.debian.org/debian/
-      Suites: sid
-      Components: main non-free-firmware
-      Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
-      EOF
-      # update and install firmware from unstable
-      apt update
-      apt -y install -t unstable firmware-atheros firmware-qcom-soc
-      # remove sid APT sources and update again
-      rm -f /etc/apt/sources.list.d/debian-sid.sources
-      apt update
-
-{{- if eq $experimentalkernel "true" }}
-  # this is an optional temporary option to install the kernel from
-  # experimental until trixie/sid have a recent enough kernel, or some overlay
-  # archive is provided; note that the original linux-image-arm64 is kept
-  - action: run
-    description: Install Linux kernel from experimental
-    chroot: true
-    command: |
-      set -eux
-      # add experimental APT sources
-      cat >/etc/apt/sources.list.d/debian-experimental.sources <<EOF
-      Types: deb
-      URIs: http://deb.debian.org/debian/
-      Suites: experimental
-      Components: main non-free-firmware
-      Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
-      EOF
-      # update and install kernel from experimental
-      apt update
-      apt -y install -t experimental {{$kernelpackage}}
-      # disable experimental from APT sources
-      sed -i "1s/^/Enabled: no\n/" \
-          /etc/apt/sources.list.d/debian-experimental.sources
-{{- end }}
-
   # this is currently needed on boards such as RB1 which are using Android
   # bootloader to check the boot count of the boot_a/boot_b partitions
   - action: apt