Mesa extentsion: adjust KDE related troubles with packages downgrade

- 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
This commit is contained in:
Igor Pecovnik 2024-08-17 15:38:46 +02:00 committed by August
parent 528cac174b
commit 3df77898a5
2 changed files with 14 additions and 5 deletions

View File

@ -140,20 +140,26 @@ function post_install_kernel_debs__3d() {
EOF EOF
fi fi
# 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" display_alert "Updating sources list, after kisak PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get_update 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
# 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" 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" display_alert "Upgrading Mesa packages" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get dist-upgrade do_with_retries 3 chroot_sdcard_apt_get dist-upgrade
# KDE neon downgrade hack undo # 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 # Disable wayland flag for XFCE
#if [[ "${DESKTOP_ENVIRONMENT}" == "xfce" ]]; then #if [[ "${DESKTOP_ENVIRONMENT}" == "xfce" ]]; then

View File

@ -105,6 +105,9 @@ case "$1" in
[[ "${LINUXFAMILY}" == meson64 ]] && set_fixed_mac [[ "${LINUXFAMILY}" == meson64 ]] && set_fixed_mac
[[ "${BOARD}" == nanopi-r6* ]] && 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 systemctl disable armbian-firstrun
exit 0 exit 0
;; ;;