From 766cfd33a284d448147e3cccc147f94109f15207 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Sep 2019 21:02:41 +0100 Subject: [PATCH 01/14] init: add fix for RPi4 serial numbers --- packages/sysutils/busybox/scripts/init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index aa61489f05..43e32c57cf 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -48,7 +48,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 From b18d021586950e2823447e0ad43c4e5717a4644e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 19 Sep 2019 21:52:22 +0200 Subject: [PATCH 02/14] rpi-eeprom: allow overriding BOOTFS from environment Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/config/rpi-eeprom-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/rpi-eeprom/config/rpi-eeprom-update b/packages/tools/rpi-eeprom/config/rpi-eeprom-update index 0e85be4214..0a62ac0b4a 100644 --- 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} From d25b4aef4a6b3022762ada6ec56a5a22c142b68c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 22 Sep 2019 00:28:10 +0100 Subject: [PATCH 03/14] bcmstat: update to bcmstat-0.5.3 --- packages/tools/bcmstat/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/bcmstat/package.mk b/packages/tools/bcmstat/package.mk index eaca87b0ef..ad63cfa914 100644 --- 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" From dae7e1c5341533d40c1b864676d846ecfa08c697 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 5 Sep 2019 15:32:56 +0100 Subject: [PATCH 04/14] u-boot-tools: fix missing dependencies --- packages/tools/u-boot-tools/package.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk index dc1041b95e..85c8e419ad 100644 --- 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 From ecc35003950879d86e1516165ca5155ccb3dceef Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 16 Sep 2019 02:51:03 +0100 Subject: [PATCH 05/14] config/options: log PWD when the current directory includes a space --- config/options | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/options b/config/options index 13f214ac17..2bebb8d4cc 100644 --- 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 From 4e1fc8b029caafd77ae8c5a1052d9d397d644b30 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Sep 2019 23:36:12 +0100 Subject: [PATCH 06/14] linux: rebuild linux if busybox (ie. scripts/init) changes --- packages/linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 435c3cbc1a..8190899dc7 100644 --- 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" From f75ec82571cd2f7bbe3c88d99a6fd5b5d16b0b9e Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 3 Sep 2019 20:58:10 +0100 Subject: [PATCH 07/14] RPi btuart: Sync with upstream 0.1.11 --- .../scripts/rpi-btuart | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart index fb89ef84e6..b9c6cee09d 100755 --- 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 From e1034f423d4c02dd9330a2b913162d0744903dbe Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 10 Oct 2019 12:36:22 +0100 Subject: [PATCH 08/14] rpi-eeprom: update to rpi-eeprom-741bf84 --- packages/tools/rpi-eeprom/package.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index 13df7d93bc..5bab4a7521 100644 --- 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 From a15eeec91baa3529a8bc56c353a361455b49eccd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 25 Sep 2019 15:59:00 +0100 Subject: [PATCH 09/14] kodi: fix pastekodi efi check --- packages/mediacenter/kodi/scripts/pastekodi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/scripts/pastekodi b/packages/mediacenter/kodi/scripts/pastekodi index 98a4054b51..eb023354eb 100755 --- a/packages/mediacenter/kodi/scripts/pastekodi +++ b/packages/mediacenter/kodi/scripts/pastekodi @@ -36,7 +36,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" From cad016cb9fad6a5c56d2c10931d5758c7592f713 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 17 Sep 2019 12:08:49 +0100 Subject: [PATCH 10/14] mesa: update to mesa-19.1.7 --- packages/graphics/mesa/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index ce878c6c33..02e535e352 100644 --- 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" From 5ecc7e36743da622e710e9a008a2eed9c363374d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 4 Oct 2019 19:03:20 +0100 Subject: [PATCH 11/14] pastekodi: add option to allow output to stdout --- packages/mediacenter/kodi/scripts/pastekodi | 23 ++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/scripts/pastekodi b/packages/mediacenter/kodi/scripts/pastekodi index eb023354eb..bb77b85348 100755 --- 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 </dev/null +) | ${OUTPUT} 2>/dev/null From fd9975888c29f42d793807ee494ecccd70ffba27 Mon Sep 17 00:00:00 2001 From: pretoriano80 Date: Thu, 12 Sep 2019 19:59:27 +0300 Subject: [PATCH 12/14] eventlircd: adding new rule for iMON Panel, Knob and Mouse(15c2:ffdc) - enables eventlircd for Imon UltraBay (front panel buttons) - this will fix the issue with some front panel buttons not being detected by Kodi (if keycode value is higher than 255) Signed-off-by: pretoriano80 --- packages/sysutils/eventlircd/udev.d/98-eventlircd.rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules index e1d36d4ebe..8e63d2fe61 100644 --- 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 From a18f2196543e29eb63aedc4b60c739fde6f4995a Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 10 Oct 2019 13:54:18 +0100 Subject: [PATCH 13/14] LibreELEC-settings: update to LibreELEC-settings-a799a10 --- packages/mediacenter/LibreELEC-settings/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index cd868c8308..81ebb6fb31 100644 --- 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" From d4508cd8830b02b5b69f29c14ebcd8da840560fd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 11 Oct 2019 06:52:45 +0100 Subject: [PATCH 14/14] brcmfmac_sdio-firmware-rpi: update to brcmfmac_sdio-firmware-rpi-d4f7087 --- packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk index e02adc11cb..35b5fe43af 100644 --- 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"