Skip to content

Commit

Permalink
Mesa extentsion: adjust KDE related troubles with packages downgrade
Browse files Browse the repository at this point in the history
- one is actually general fix - recommened installation of library before installing rockchip-multimedia
- second is holding package before running upgrade as it wants to pull older library from kde repositories
- remove KDE Neon base files upgrade pin
  • Loading branch information
igorpecovnik committed Aug 17, 2024
1 parent 54c79a2 commit 350da61
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
14 changes: 10 additions & 4 deletions extensions/mesa-vpu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,26 @@ function post_install_kernel_debs__3d() {
EOF
fi

display_alert "Updating sources list, after kisak PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get_update

# KDE neon downgrades base-files for some reason. This prevents tacking it
do_with_retries 3 chroot_sdcard apt-mark hold base-files

display_alert "Updating sources list, after kisak PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get_update
# This library must be installed before rockchip-multimedia
do_with_retries 3 chroot_sdcard_apt_get_install libv4l-0

display_alert "Installing 3D extension packages" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get_install --allow-downgrades "${pkgs[@]}"
do_with_retries 3 chroot_sdcard_apt_get_install "${pkgs[@]}"

# This library gets downgraded
do_with_retries 3 chroot_sdcard apt-mark hold libdav1d7

display_alert "Upgrading Mesa packages" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get dist-upgrade

# KDE neon downgrade hack undo
do_with_retries 3 chroot_sdcard apt-mark unhold base-files
do_with_retries 3 chroot_sdcard apt-mark unhold base-files libdav1d7

# Disable wayland flag for XFCE
#if [[ "${DESKTOP_ENVIRONMENT}" == "xfce" ]]; then
Expand Down
3 changes: 3 additions & 0 deletions packages/bsp/common/usr/lib/armbian/armbian-firstrun
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ case "$1" in
[[ "${LINUXFAMILY}" == meson64 ]] && set_fixed_mac
[[ "${BOARD}" == nanopi-r6* ]] && set_fixed_mac

# Remove KDE Neon base files upgrade pin
[[ -f /etc/apt/preferences.d/99-neon-base-files ]] && rm -f /etc/apt/preferences.d/99-neon-base-files

systemctl disable armbian-firstrun
exit 0
;;
Expand Down

0 comments on commit 350da61

Please sign in to comment.