Skip to content

Commit

Permalink
v6.29
Browse files Browse the repository at this point in the history
+ DietPi-Software | Use G_AGI to install deb packages as well, apply same Xserver fix for Asus TB that we applied to RK3399 already, switch to G_EXEC, temporarily not available but PR will be merged soo
  • Loading branch information
MichaIng authored Mar 26, 2020
1 parent c8db97e commit 59cdaa9
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -6210,11 +6210,11 @@ sudo -u $ha_user dash -c '$ha_pyenv_activation; pip3 install -U homeassistant'"

# X.org packages and config
Download_Install 'https://dietpi.com/downloads/binaries/rk3399/xserver.7z' xserver
dpkg --force-hold,confdef,confold -i xserver/*.deb
G_AGI ./xserver/*.deb
G_BACKUP_FP /etc/X11/xorg.conf
dps_index=$software_id Download_Install 'xorg_rk3399.conf' /etc/X11/xorg.conf
# Quick fix, cleaner ToDo: https://github.com/MichaIng/DietPi/issues/2399#issuecomment-599651391
[[ -f '/usr/lib/librga.so' ]] || G_RUN_CMD wget https://github.com/rockchip-linux/rk-rootfs-build/raw/master/packages/arm64/rga/lib/librga.so -O /usr/lib/
[[ -f '/usr/lib/librga.so' ]] || G_EXEC wget https://github.com/rockchip-linux/rk-rootfs-build/raw/master/packages/arm64/rga/lib/librga.so -O /usr/lib/librga.so

# Odroid C2: http://fuzon.co.uk/meveric/pool/main/s/setup-odroid/
elif (( $G_HW_MODEL == 12 )); then
Expand Down Expand Up @@ -6258,9 +6258,11 @@ sudo -u $ha_user dash -c '$ha_pyenv_activation; pip3 install -U homeassistant'"

# X.org packages and config
Download_Install 'https://dietpi.com/downloads/binaries/asus/xserver.7z' xserver
dpkg --force-hold,confdef,confold -i xserver/*.deb
G_AGI ./xserver/*.deb
G_BACKUP_FP /etc/X11/xorg.conf
dps_index=$software_id Download_Install 'xorg_asustb.conf' /etc/X11/xorg.conf
# Quick fix, cleaner ToDo: https://github.com/MichaIng/DietPi/issues/2399#issuecomment-599651391
[[ -f '/usr/lib/librga.so' ]] || G_EXEC wget https://github.com/rockchip-linux/rk-rootfs-build/raw/master/packages/armhf/rga/lib/librga.so -O /usr/lib/librga.so

fi

Expand Down

0 comments on commit 59cdaa9

Please sign in to comment.