Skip to content

Commit

Permalink
v8.2
Browse files Browse the repository at this point in the history
- DietPi-Software | X.Org X Server: Resolved an issue on modern Odroid C2 and NanoPi K2 (Amlogic S905 SoC) images where the X server (desktop) failed to start. Many thanks to all users who reported and helped resolving this issue: #5234, https://dietpi.com/phpbb/viewtopic.php?t=10078
  • Loading branch information
MichaIng committed Feb 25, 2022
1 parent 327e9a6 commit 572d1b3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Fixes:
- DietPi-Software | Pydio: Resolved an issue where the data directory was not writeable. Many thanks @holocronology for reporting this issue: https://github.com/MichaIng/DietPi/issues/5274
- DietPi-Software | Jellyfin: Resolved an issue where during install two settings failed to apply since the config file didn't exist yet. Many thanks to @echtfrank for reporting this issue: https://github.com/MichaIng/DietPi/issues/5279
- DietPi-Software | Firefox: Resolved a warning on startup about the missing libpci library, used to detect GPU details. Many thanks to @MDAR for reporting this issue: https://github.com/MichaIng/DietPi/issues/5278#issuecomment-1044381054
- DietPi-Software | X.Org X Server: Resolved an issue on modern Odroid C2 and NanoPi K2 (Amlogic S905 SoC) images where the X server (desktop) failed to start. Many thanks to all users who reported and helped resolving this issue: https://github.com/MichaIng/DietPi/issues/5234, https://dietpi.com/phpbb/viewtopic.php?t=10078

As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/XXXX

Expand Down
31 changes: 27 additions & 4 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -2677,7 +2677,7 @@ _EOF_
# Disable DPMS and screen blanking
dps_index=$software_id Download_Install '98-dietpi-disable_dpms.conf' /etc/X11/xorg.conf.d/98-dietpi-disable_dpms.conf

# Odroid C1: https://dietpi.com/meveric/pool/main/s/setup-odroid/
# Odroid C1 legacy: https://dietpi.com/meveric/pool/main/s/setup-odroid/
if (( $G_HW_MODEL == 10 )) && [[ $G_DISTRO -le 5 || ! -e '/dev/dri' ]]
then
local apackages=()
Expand All @@ -2694,7 +2694,7 @@ _EOF_
G_AGI "${apackages[@]}"
# xf86-video-armsoc-odroid creates an xorg.conf

# Odroid C2
# Odroid C2 legacy
elif (( $G_HW_MODEL == 12 )) && [[ $G_DISTRO -le 5 || ! -e '/dev/dri' ]]
then
apt-cache dumpavail | grep -q '^Package: mali450-odroid$' && DEPS_LIST='mali450-odroid' || DEPS_LIST='libegl1 libgles2'
Expand All @@ -2707,14 +2707,14 @@ _EOF_
DEPS_LIST+=' xserver-xorg-video-fbdev'
fi

# Odroid N2: https://dietpi.com/phpbb/viewtopic.php?t=9206
# Odroid N2 legacy: https://dietpi.com/phpbb/viewtopic.php?t=9206
elif (( $G_HW_MODEL == 15 )) && [[ $G_DISTRO -le 5 || ! -e '/dev/dri' ]]
then
local apackages=('xserver-xorg-video-fbdev')
apt-cache dumpavail | grep -q '^Package: malig52-fbdev-opencl-odroid$' && apackages+=('malig52-fbdev-opencl-odroid') || apackages+=('libegl1' 'libgles2')
G_AGI "${apackages[@]}"

# Odroid C4
# Odroid C4 legacy
elif (( $G_HW_MODEL == 16 )) && [[ $G_DISTRO -le 5 || ! -e '/dev/dri' ]]
then
local apackages=('xserver-xorg-video-fbdev')
Expand All @@ -2725,6 +2725,29 @@ _EOF_
elif (( $G_HW_ARCH < 10 && $G_HW_MODEL < 10 ))
then
G_AGI libegl1 libgles2

# Amlogic S905 modern
if [[ $G_HW_CPUID == 7 && -e '/dev/dri' ]]
then
cat << '_EOF_' > /etc/X11/xorg.conf.d/02-dietpi-aml-s905.conf
Section "OutputClass"
Identifier "Amlogic"
MatchDriver "meson"
Driver "modesetting"
Option "PrimaryGPU" "true"
EndSection
Section "Screen"
Identifier "Default Screen"
Device "Meson"
Monitor "foo"
DefaultDepth 24
SubSection "Display"
Depth 24
Modes "1920x1080" "1440x900" "1280x720" "1280x1024" "1280x960" "1024x768" "800x600" "640x480" "720x400"
EndSubSection
EndSection
_EOF_
fi
fi

fi
Expand Down

0 comments on commit 572d1b3

Please sign in to comment.