Skip to content

Commit

Permalink
v6.26 (#3092)
Browse files Browse the repository at this point in the history
+ DietPi-Software | Kodi: Fix Kodi install on RPi Buster, since archive.raspbian.org does not yet contain a Buster-compatible package. Use a 3rd-party repo for RPi1-3 for now and a custom compiled package for RPi4, to have full GPU acceleration.
+ DietPi-Software | Kodi: start_kodi will now run plain kodi binary with --standalone argument. kodi-rpi4 and kodi-standalone are shell wrappers only, that do nothing that we want or require.
+ DietPi-Software | Kodi: fbset seems to be not required for the custom Buster+RPi4-compatible Kodi 18 builds, thus only install on RPi+Stretch
  • Loading branch information
MichaIng authored Sep 16, 2019
1 parent 5db4a33 commit 7719107
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Bug Fixes:
- DietPi-Config | Resolved an issue on RPi where headless mode did not disable all video outputs and framebuffer as intended, since the used config.txt setting has been removed with recent firmware versions.
- DietPi-Software | Resolved an issue where the script tells you that SQLite will be installed as pre-req, while actually a desktop is required and LXDE will be installed.
- DietPi-Software | X11/Kodi on Odroid C2: Resolved an issue on Odroid C2 where Kodi failed to start. GPU drivers and X11 config will be updated during DietPi-Update to cover this issue. Many thanks to @alexeylutskov for reporting this issue and testing the fix: https://github.com/MichaIng/DietPi/issues/3028
- DietPi-Software | Kodi: Resolved an issue where Kodi failed on RPi Buster and RPi4. Many thanks to @GulyFMG, @derdershat and @jonyskids for reporting this issue, searching and testing workarounds: https://github.com/MichaIng/DietPi/issues/3031
- DietPi-Software | Gitea: Resolved an issue where install fails on ARMv7 systems. Many thanks to @maschiw for reporting this issue: https://github.com/MichaIng/DietPi/issues/2959
- DietPi-Software | Node-RED: Resolved an issue where install fails due to missing data dir creation. Many thanks to @Orfait for reporting this issue: https://github.com/MichaIng/DietPi/issues/2975
- DietPi-Software | Node-RED: Resolved an issue where user creation fails if "gpio" group is not present. Many thanks to @marcobrianza for reporting this issue: https://github.com/MichaIng/DietPi/issues/2975#issuecomment-513917360
Expand Down
56 changes: 42 additions & 14 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -3669,28 +3669,56 @@ _EOF_

Banner_Installing

# Odroids
if (( $G_HW_MODEL > 9 )) && (( $G_HW_MODEL < 20 )); then
# CEC support + libcurl3-gnutls required for C2, but lets apply to all: https://github.com/MichaIng/DietPi/issues/446
local package_list='libcec4 libcurl3-gnutls'

local package_list='kodi-odroid'
# NFS support
(( $G_DISTRO < 5 )) && package_list+=' libnfs8' || package_list+=' libnfs12'

# RPi4: https://github.com/MichaIng/DietPi/issues/3031
if (( $G_HW_MODEL == 4 )); then

DEPS_LIST=$package_list
no_check_url=1 Download_Install 'https://transfer.sh/X7gZH/kodi-rpi4_18.4.0-1_armhf.deb'

# Everything else
else

local package_list='kodi'
# Odroids
if [[ $G_HW_MODEL == 1[0-9] ]]; then

# RPi: Kodi 18 requires fbset to start with custom screen resolution: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550
(( $G_HW_MODEL < 10 )) && package_list+=' fbset'
package_list+=' kodi-odroid'

fi
# Everything else
else

# CEC support + libcurl3-gnutls required for C2, but lets apply to all: https://github.com/MichaIng/DietPi/issues/446
package_list+=' libcec4 libcurl3-gnutls'
package_list+=' kodi'

# NFS support
(( $G_DISTRO < 5 )) && package_list+=' libnfs8' || package_list+=' libnfs12'
# RPi1/2/3
if (( $G_HW_MODEL < 10 )); then

G_AGI $package_list
# - Buster: https://github.com/MichaIng/DietPi/issues/3031
if (( $G_DISTRO > 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
G_AGUP

# - Stretch: fbset required to start with custom screen resolution: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550
else

package_list+=' fbset'

fi

fi

fi

G_AGI $package_list

fi

fi

Expand Down Expand Up @@ -4784,7 +4812,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=sid\nPin-Prior
else

Download_Install "https://dietpi.com/downloads/binaries/stretch/netdata_$G_HW_ARCH_DESCRIPTION.7z"
dpkg --force-hold,confdef,confnew -i netdata{-core,-plugins-bash,-web,}_*.deb
dpkg --force-hold,confdef,confold -i netdata{-core,-plugins-bash,-web,}_*.deb
G_AGF
rm netdata*

Expand Down
6 changes: 3 additions & 3 deletions dietpi/misc/start_kodi
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
#////////////////////////////////////
# Import DietPi-Globals --------------------------------------------------------------
# G_HW_MODEL required only
G_HW_MODEL=$(sed -n 1p /DietPi/dietpi/.hw_model)
G_HW_MODEL=$(mawk 'NR==1 {print}' /DietPi/dietpi/.hw_model)
# Import DietPi-Globals --------------------------------------------------------------

#/////////////////////////////////////////////////////////////////////////////////////
# Main Loop
#/////////////////////////////////////////////////////////////////////////////////////
# Raspberry Pi
# RPi
if (( $G_HW_MODEL < 10 )); then

kodi-standalone
kodi --standalone

# Everything else
# - From desktop
Expand Down

0 comments on commit 7719107

Please sign in to comment.