From 25e68611a95756150a010c829549d2ecf0417350 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Tue, 8 Oct 2019 15:25:08 +0200 Subject: [PATCH] v6.26 + DietPi-Software | Kodi: Remove RPi Buster workaround since Kodi 18 has just been added to official RPi repo --- dietpi/dietpi-software | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index fee47e17c1..81c5e74201 100644 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -3680,28 +3680,18 @@ _EOF_ # RPi if (( $G_HW_MODEL < 10 )); then - # fbset required to start with custom screen resolution/remove warning on startup: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550 + # fbset required to recover desktop with custom resolution and fix startup warning: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550 package_list+=' fbset' - # Buster: https://github.com/MichaIng/DietPi/issues/3031 - if (( $G_DISTRO > 4 )); then + # RPi4: fake KMS driver required: https://www.raspberrypi.org/forums/viewtopic.php?f=66&t=251645 + if (( $G_HW_MODEL == 4 )); then - INSTALL_URL_ADDRESS='http://pipplware.pplware.pt/pipplware/key.asc' - G_CHECK_URL "$INSTALL_URL_ADDRESS" - curl -sSL "$INSTALL_URL_ADDRESS" | apt-key add - - echo 'deb http://pipplware.pplware.pt/pipplware/dists/buster/main/binary /' > /etc/apt/sources.list.d/dietpi-kodi.list + /DietPi/dietpi/func/dietpi-set_hardware rpi-opengl vc4-fkms-v3d - # RPi4: fake KMS driver required: https://www.raspberrypi.org/forums/viewtopic.php?f=66&t=251645 - if (( $G_HW_MODEL == 4 )); then - - /DietPi/dietpi/func/dietpi-set_hardware rpi-opengl vc4-fkms-v3d - - # Else legacy (non-GL) driver required - else - - /DietPi/dietpi/func/dietpi-set_hardware rpi-opengl disable + # Else legacy (non-GL) driver required + else - fi + /DietPi/dietpi/func/dietpi-set_hardware rpi-opengl disable fi