From 6556ca62c9b56cf34439af58f2386afc71a28e4a 2019-10-23 19:56:43
From: Unknown <xyz258@abwesend.de>
Date: 2019-10-23 19:56:43
Subject: [PATCH] bullseye fix
no more collabora link
---

diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 4a4469c..2c1ad4b 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -16,7 +16,7 @@ install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
 
 # Use specified APT server and release
 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
-if [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "testing" ] ; then
+if [ "$RELEASE" = "testing" ] ; then
 sed -i "s,stretch\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
 else
 sed -i "s/ stretch/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index 2a2fa9e..b8ca28c 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -44,6 +44,9 @@ RPI_MODEL=${RPI_MODEL:=2}
 
 # Debian release
 RELEASE=${RELEASE:=buster}
+if [ $RELEASE = bullseye] ; then
+ RELEASE=testing
+fi
 
 # Kernel Branch
 KERNEL_BRANCH=${KERNEL_BRANCH:=""}
@@ -52,7 +55,6 @@ KERNEL_BRANCH=${KERNEL_BRANCH:=""}
 KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
 FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
 WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
-COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
 FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
 UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
 VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}