From dc3793318828ba9e9543b64b39c68011081bcae8 2019-10-23 21:01:28
From: Unknown <xyz258@abwesend.de>
Date: 2019-10-23 21:01:28
Subject: [PATCH] fixes bullseye/testing renaming for chroot
removed colabora url as its not used anymore
MMC fix isn't needed anymore and thus removed
---

diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 71fbc22..bc9cd79 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/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index a8bd8d0..45c92fd 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -108,10 +108,10 @@ if [ "$BUILD_KERNEL" = true ] ; then
 	    # Mask this temporarily during switch to rpi-4.19.y
 	    #Fix SD_DRIVER upstream and downstream mess in 64bit RPIdeb_config
 	    # use correct driver MMC_BCM2835_MMC instead of MMC_BCM2835_SDHOST - see https://www.raspberrypi.org/forums/viewtopic.php?t=210225
-	    set_kernel_config CONFIG_MMC_BCM2835 n
-	    set_kernel_config CONFIG_MMC_SDHCI_IPROC n
-	    set_kernel_config CONFIG_USB_DWC2 n
-	    sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig
+	    #set_kernel_config CONFIG_MMC_BCM2835 n
+	    #set_kernel_config CONFIG_MMC_SDHCI_IPROC n
+	    #set_kernel_config CONFIG_USB_DWC2 n
+	    #sed -i "s|depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA|depends on MMC_BCM2835_MMC|" "${KERNEL_DIR}"/drivers/mmc/host/Kconfig
 	  
 	    #VLAN got disabled without reason in arm64bit
 	    set_kernel_config CONFIG_IPVLAN m
@@ -600,10 +600,10 @@ if [ "$BUILD_KERNEL" = true ] ; then
 
 	    case "$KERNEL_DEFAULT_GOV" in
           performance)
-	        set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
+	            set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
             ;;
           userspace)
-            set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE y
+            	    set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE y
             ;;
           ondemand)
 		    set_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND y
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index ccb01a5..bc7c72c 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}