Merge pull request #3865 from MilhouseVH/le92_backports5

libreelec-9.2 backports
2025-07-24 11:16:51 +00:00 · 2019-10-14 21:13:55 +02:00 · 2019-10-14 21:13:55 +02:00 · d86dcbd288
commit d86dcbd288
parent 98394a9d5a d4508cd883
13 changed files with 64 additions and 29 deletions
--- a/config/options
+++ b/config/options
@ -6,6 +6,8 @@ fi

 # Spaces in paths are verboten
 if [[ ${PWD} =~ [[:space:]] ]]; then
+  echo "Current PWD: \"${PWD}\"" 1>&2
+  echo 1>&2
  echo "Building in a folder that includes spaces is NOT supported. Use a folder without spaces." 1>&2
  exit 1
 fi
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="mesa"
-PKG_VERSION="19.1.6"
-PKG_SHA256="a3dc32262e3baa6a32cd153c32b0a5af3e52e0b88ff94787438e7414eb13264e"
+PKG_VERSION="19.1.7"
+PKG_SHA256="97c9f6a6127bee5ab21c3fe63ff3e0bd73a7966415f92f66500b0b276b7150da"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://github.com/mesa3d/mesa/archive/mesa-$PKG_VERSION.tar.gz"
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="brcmfmac_sdio-firmware-rpi"
-PKG_VERSION="688531da4bcf802a814d9cb0c8b6d62e3b8a3327"
-PKG_SHA256="51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626"
+PKG_VERSION="d4f7087ecbc8eff9cb64a4650765697157821d64"
+PKG_SHA256="05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/LibreELEC/LibreELEC.tv"
 PKG_URL="https://github.com/LibreELEC/$PKG_NAME/archive/$PKG_VERSION.tar.gz"
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
@ -1,14 +1,22 @@
 #!/bin/sh

 HCIATTACH=/usr/bin/hciattach
-SERIAL=$(awk '/^Serial/{ print $3 }' /proc/cpuinfo)
-B1=${SERIAL:10:2}
-B2=${SERIAL:12:2}
-B3=${SERIAL:14:2}
-BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
+if grep -q "Pi 4" /proc/device-tree/model; then
+  BDADDR=
+else
+  SERIAL=$(cat /proc/device-tree/serial-number | cut -c9-)
+  B1=${SERIAL:2:2}
+  B2=${SERIAL:4:2}
+  B3=${SERIAL:6:2}
+  BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
+fi

-if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
-  if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
+uart0="$(cat /proc/device-tree/aliases/uart0)"
+serial1="$(cat /proc/device-tree/aliases/serial1)"
+
+if [ "$uart0" = "$serial1" ] ; then
+  uart0_pins="$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')"
+  if [ "$uart0_pins" = "16" ] ; then
    $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
  else
    $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@ -8,7 +8,7 @@ PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host openssl:host"
 PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET"
 PKG_DEPENDS_INIT="toolchain"
-PKG_NEED_UNPACK="$LINUX_DEPENDS"
+PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory busybox)"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
 PKG_IS_KERNEL_PKG="yes"
 PKG_STAMP="$KERNEL_TARGET $KERNEL_MAKE_EXTRACMD"
--- a/packages/mediacenter/LibreELEC-settings/package.mk
+++ b/packages/mediacenter/LibreELEC-settings/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="LibreELEC-settings"
-PKG_VERSION="d9765c9db18dc45a2bcc2b8d37dde41f38bb8f4b"
-PKG_SHA256="2c3714147298c5133250956496e4ae1987d6b84b37bca535454c13685706429b"
+PKG_VERSION="a799a10652567cfd327fd588cf0e180d9962cf61"
+PKG_SHA256="d72329051ac748cb6764597b36b2a6ed965f9b95c11a224b1a92ddf27db721be"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL="https://github.com/LibreELEC/service.libreelec.settings/archive/$PKG_VERSION.tar.gz"
--- a/packages/mediacenter/kodi/scripts/pastekodi
+++ b/packages/mediacenter/kodi/scripts/pastekodi
@ -14,6 +14,27 @@ cat_file() {
  fi
 }

+usage() {
+  [ -n "${1}" ] && echo "Unknown argument: ${1}"
+  cat <<EOF
+Usage: $0 [-c] [-h]
+
+  -c   send output to stdout not via /usr/bin/pastebinit
+  -h   this help message
+EOF
+  exit 1
+}
+
+OUTPUT="/usr/bin/pastebinit"
+
+while getopts ":hc" opt; do
+  case ${opt} in
+    c) OUTPUT="cat";;
+    ?) usage "${OPTARG}";;
+    h) usage;;
+  esac
+done
+
 source /etc/os-release
 SYSTEM_ARCH="${LIBREELEC_ARCH#*.}"

@ -36,7 +57,7 @@ fi
  echo "${LOG_TYPE} log output for: $(lsb_release)"

  if [ "${SYSTEM_ARCH}" = "x86_64" ]; then
-    if [ -f "/sys/firmware/efi" ]; then
+    if [ -d "/sys/firmware/efi" ]; then
      echo "Firmware Boot Mode: EFI"
    else
      echo "Firmware Boot Mode: BIOS"
@ -70,4 +91,4 @@ fi
  cat_file "${KODI_ROOT}/.smb/smb.conf"
  cat_file "${KODI_ROOT}/.smb/user.conf"
  cat_file "/run/samba/smb.conf"
-) | /usr/bin/pastebinit 2>/dev/null
+) | ${OUTPUT} 2>/dev/null
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@ -51,7 +51,7 @@ BREAK_TRIPPED="no"
 BIGFONT="1080"

 # Get a serial number if present (eg. RPi) otherwise use MAC address from eth0
-MACHINE_UID="$(cat /proc/cpuinfo | awk '/^Serial/{s=$3; gsub ("^0*","",s); print s}')"
+MACHINE_UID="$(awk '/^Serial/{s='0000000' $3; print substr(s, length(s) - 7)}' /proc/cpuinfo)"
 [ -z "$MACHINE_UID" ] && MACHINE_UID="$(cat /sys/class/net/eth0/address 2>/dev/null | tr -d :)"

 # common functions
--- a/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
+++ b/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
@ -73,6 +73,11 @@ SUBSYSTEMS=="input", ATTRS{name}=="Xiaomi Remote", \
 SUBSYSTEMS=="input", ATTRS{name}=="小米蓝牙遥控器", \
  ENV{eventlircd_enable}="true", \
  ENV{eventlircd_evmap}="xiaomibtremoteAM.evmap"
+  
+ # iMON Ultrabay Front Panel
+SUBSYSTEMS=="input", ATTRS{name}=="iMON Panel, Knob and Mouse(15c2:ffdc)", \
+  ENV{eventlircd_enable}="true", \
+  ENV{eventlircd_evmap}="default.evmap" 

 #-------------------------------------------------------------------------------
 # Ask eventlircd to handle USB HID devices that show up as event devices and are
--- a/packages/tools/bcmstat/package.mk
+++ b/packages/tools/bcmstat/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="bcmstat"
-PKG_VERSION="0.5.2"
-PKG_SHA256="55dec681b8dddb3b4d98e339644fa68ff3d0f05d287b09037cbad4d450df7a3a"
+PKG_VERSION="0.5.3"
+PKG_SHA256="eec3ddccefe9cc31c51f163e5ed7257e97efdde91eda6c5f7e60734736390cf3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/MilhouseVH/bcmstat"
 PKG_URL="https://github.com/MilhouseVH/$PKG_NAME/archive/$PKG_VERSION.tar.gz"
--- a/packages/tools/rpi-eeprom/config/rpi-eeprom-update
+++ b/packages/tools/rpi-eeprom/config/rpi-eeprom-update
@ -1,4 +1,4 @@
 # Use direct path to firmware as update script doesn't dereference sym links.
 FIRMWARE_ROOT="/usr/lib/kernel-overlays/base/lib/firmware/raspberrypi/bootloader"
 FIRMWARE_BACKUP_DIR="/storage/.config/rpifw-backup"
-BOOTFS=/flash
+BOOTFS=${BOOTFS:-/flash}
--- a/packages/tools/rpi-eeprom/package.mk
+++ b/packages/tools/rpi-eeprom/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="rpi-eeprom"
-PKG_VERSION="1923a55d0e4629becf50b834a83b86e6d5a55233"
-PKG_SHA256="2775c6f9975d43aa6f6714de648fc1cab08b5c8de599cc942a9baad378c2cefe"
+PKG_VERSION="741bf84e3262b9303470cd02689d297aef4a8c95"
+PKG_SHA256="8d84824068ef6ed10d22d69d84199f1ac38a1dbe4fb1c5ae63ca153e38ec1339"
 PKG_ARCH="arm"
 PKG_LICENSE="BSD-3/custom"
 PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"
@ -16,15 +16,13 @@ makeinstall_target() {
  DESTDIR=${INSTALL}/$(get_kernel_overlay_dir)/lib/firmware/raspberrypi/bootloader

  mkdir -p ${DESTDIR}
-    mkdir -p ${DESTDIR}/${_dir}
-      cp -PRv ${PKG_BUILD}/firmware/recovery.bin ${DESTDIR}
-
    _dirs="critical"
    [ "$LIBREELEC_VERSION" = "devel" ] && _dirs+=" beta"
    for _dir in ${_dirs}; do
      if [ -n "$(ls -1 ${PKG_BUILD}/firmware/${_dir}/pieeprom-* 2>/dev/null)" ]; then
        mkdir -p ${DESTDIR}/${_dir}
          cp -PRv $(ls -1 ${PKG_BUILD}/firmware/${_dir}/pieeprom-* | tail -1) ${DESTDIR}/${_dir}
+          cp -PRv ${PKG_BUILD}/firmware/${_dir}/recovery.bin ${DESTDIR}/${_dir}
      fi
    done

--- a/packages/tools/u-boot-tools/package.mk
+++ b/packages/tools/u-boot-tools/package.mk
@ -2,13 +2,14 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="u-boot-tools"
-PKG_LICENSE="GPL"
-PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_DEPENDS_TARGET="toolchain swig:host"
-PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 PKG_VERSION="2019.01"
 PKG_SHA256="50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.denx.de/wiki/U-Boot"
 PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_HOST="ccache:host bison:host flex:host"
+PKG_DEPENDS_TARGET="toolchain swig:host"
+PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."

 make_host() {
  make qemu-x86_64_defconfig