Merge pull request #3853 from cmitu/kodi

kodi: fix installation on Bookworm/Bullseye

Author: joolswills

scriptmodules/ports/kodi.sh

@@ -34,6 +34,14 @@ function depends_kodi() {
                 apt-key del 4096R/BAA567BB >/dev/null
             fi
         fi
+        if [[ "$__os_debian_ver" -gt 10 ]]; then
+            # install Kodi from the RPI repos directly
+            # make sure we're not installing Debian/Raspbian version by pinning the origin of the packages
+            local apt_pin_file="/etc/apt/preferences.d/01-rpie-pin-kodi"
+            if [[ ! -f "$apt_pin_file" ]]; then
+                echo -e "Package: kodi*\nPin: release o=Raspberry Pi Foundation\nPin-Priority: 900" > "$apt_pin_file"
+            fi
+        fi
     # ubuntu
     elif [[ -n "$__os_ubuntu_ver" ]] && isPlatform "x86"; then
         if [[ "$md_mode" == "install" ]]; then

scriptmodules/system.sh

@@ -190,7 +190,7 @@ function get_os_version() {
 
             # 64bit Raspberry Pi OS identifies as Debian, but functions (currently) as Raspbian
             # we will check package sources and set to Raspbian
-            if isPlatform "aarch64" && apt-cache policy | grep -q "archive.raspberrypi.org"; then
+            if isPlatform "aarch64" && apt-cache policy | grep -qE "archive.raspberrypi.(com|org)"; then
                 __os_id="Raspbian"
             fi