From 0682611f0faf5c5ca9a5e78548277b8dd2c16c8f Mon Sep 17 00:00:00 2001
From: Mark Janssen <mark@praseodym.net>
Date: Sat, 24 Nov 2018 22:44:40 +0100
Subject: [PATCH] Install kernel and firmware from Buster

Kernel 4.18 and raspi3-firmware 1.20180619-1 are now included in Buster,
so we no longer need to install those from unstable or experimental.
---
 raspi3.yaml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/raspi3.yaml b/raspi3.yaml
index 86e82fb..579234e 100644
--- a/raspi3.yaml
+++ b/raspi3.yaml
@@ -74,19 +74,10 @@ steps:
     - firmware-brcm80211
     - wireless-tools
     - wpasupplicant
+    - raspi3-firmware
+    - linux-image-arm64
     fs-tag: root-fs
 
-  # TODO: install raspi3-firmware and linux-image-arm64 from buster once they
-  # migrated in sufficiently recent versions.
-  - chroot: root-fs
-    shell: |
-      echo 'deb http://deb.debian.org/debian unstable main contrib non-free' >> /etc/apt/sources.list
-      echo 'deb http://deb.debian.org/debian experimental main contrib non-free' >> /etc/apt/sources.list
-      echo 'APT::Default-Release "buster";' > /etc/apt/apt.conf.d/08default-release
-      apt-get update
-      apt-get -y --no-show-progress -t unstable install raspi3-firmware
-      apt-get -y --no-show-progress -t experimental install linux-image-4.18.0-rc5-arm64-unsigned
-
   - shell: |
       echo "rpi3" > "${ROOT?}/etc/hostname"