From 403cf2c1de3dae66daa1039d53511ece9308d44c Mon Sep 17 00:00:00 2001
From: Johan Gunnarsson <johan.gunnarsson@gmail.com>
Date: Tue, 24 Aug 2021 19:50:07 +0200
Subject: [PATCH] Add Bookworm and remove Buster

---
 .github/workflows/prebuilt.yml |  8 ++++----
 .github/workflows/qemu.yml     |  4 ++--
 debians-arm.csv                |  6 +++---
 debians-x86.csv                |  6 +++---
 scripts/build-debian           | 12 ++----------
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/prebuilt.yml b/.github/workflows/prebuilt.yml
index 1f8012e..32a65f7 100644
--- a/.github/workflows/prebuilt.yml
+++ b/.github/workflows/prebuilt.yml
@@ -13,17 +13,17 @@ jobs:
       matrix:
         include:
           # Debian armhf
-          - boot: boot-qemu_arm_virt
-            debian: debian-buster-armhf
           - boot: boot-qemu_arm_virt
             debian: debian-bullseye-armhf
+          - boot: boot-qemu_arm_virt
+            debian: debian-bookworm-armhf
           - boot: boot-qemu_arm_virt
             debian: debian-sid-armhf
           # Debian arm64
-          - boot: boot-qemu_aarch64_virt
-            debian: debian-buster-arm64
           - boot: boot-qemu_aarch64_virt
             debian: debian-bullseye-arm64
+          - boot: boot-qemu_aarch64_virt
+            debian: debian-bookworm-arm64
           - boot: boot-qemu_aarch64_virt
             debian: debian-sid-arm64
       fail-fast: false
diff --git a/.github/workflows/qemu.yml b/.github/workflows/qemu.yml
index 72d7159..f5fef0d 100644
--- a/.github/workflows/qemu.yml
+++ b/.github/workflows/qemu.yml
@@ -73,10 +73,10 @@ jobs:
       matrix:
         include:
           - os: debian
-            suite: buster
+            suite: bullseye
             arch: i386
           - os: debian
-            suite: bullseye
+            suite: bookworm
             arch: i386
           - os: debian
             suite: sid
diff --git a/debians-arm.csv b/debians-arm.csv
index 043a6cf..5dcf210 100644
--- a/debians-arm.csv
+++ b/debians-arm.csv
@@ -1,11 +1,11 @@
 OS,Dist,Arch
 
-debian,buster,armhf
-debian,buster,arm64
-
 debian,bullseye,armhf
 debian,bullseye,arm64
 
+debian,bookworm,armhf
+debian,bookworm,arm64
+
 debian,sid,armhf
 debian,sid,arm64
 
diff --git a/debians-x86.csv b/debians-x86.csv
index 1d1a586..56d49ab 100644
--- a/debians-x86.csv
+++ b/debians-x86.csv
@@ -1,11 +1,11 @@
 OS,Dist,Arch
 
-debian,buster,i386
-debian,buster,amd64
-
 debian,bullseye,i386
 debian,bullseye,amd64
 
+debian,bookworm,i386
+debian,bookworm,amd64
+
 debian,sid,i386
 debian,sid,amd64
 
diff --git a/scripts/build-debian b/scripts/build-debian
index a955624..bcc754e 100755
--- a/scripts/build-debian
+++ b/scripts/build-debian
@@ -76,14 +76,6 @@ debian-*-sid)
 	tee debian/tmp/sources.list <<- EOF
 deb http://deb.debian.org/debian ${DIST} main
 deb-src http://deb.debian.org/debian ${DIST} main
-EOF
-	;;
-debian-*-bullseye)
-	tee debian/tmp/sources.list <<- EOF
-deb http://deb.debian.org/debian ${DIST} main
-deb-src http://deb.debian.org/debian ${DIST} main
-deb http://deb.debian.org/debian ${DIST}-updates main
-deb-src http://deb.debian.org/debian ${DIST}-updates main
 EOF
 	;;
 debian-*)
@@ -92,8 +84,8 @@ deb http://deb.debian.org/debian ${DIST} main
 deb-src http://deb.debian.org/debian ${DIST} main
 deb http://deb.debian.org/debian ${DIST}-updates main
 deb-src http://deb.debian.org/debian ${DIST}-updates main
-deb http://security.debian.org/debian-security ${DIST}/updates main
-deb-src http://security.debian.org/debian-security ${DIST}/updates main
+deb http://security.debian.org/debian-security ${DIST}-security main
+deb-src http://security.debian.org/debian-security ${DIST}-security main
 EOF
 	;;
 ubuntu-amd64-*)