From f72856519088e5e4e51440bf3ded9bb9a33df108 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 12:47:18 +0200 Subject: [PATCH 1/4] bcmstat: switch to popcornmix's fork Signed-off-by: Matthias Reichl --- packages/tools/bcmstat/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/tools/bcmstat/package.mk b/packages/tools/bcmstat/package.mk index 3065f5e652..a8d771346c 100644 --- a/packages/tools/bcmstat/package.mk +++ b/packages/tools/bcmstat/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcmstat" -PKG_VERSION="0.5.5" -PKG_SHA256="faf21907c183ec45ca5a7737a220d3275d24a7d8a387344ed1562849b2d67f27" +PKG_VERSION="1698ec66f7dd38b21d92958dfe08a79dd07300a5" +PKG_SHA256="6a4c30778abb80c47be984b01cf9a5cfce83bcc7c673303693945c9a0f5c876a" PKG_LICENSE="GPL" -PKG_SITE="https://github.com/MilhouseVH/bcmstat" -PKG_URL="https://github.com/MilhouseVH/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" +PKG_SITE="https://github.com/popcornmix/bcmstat" +PKG_URL="https://github.com/popcornmix/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Raspberry Pi monitoring script" PKG_TOOLCHAIN="manual" From 2231881f72e40f8a06e43449b8e6fe97916b155b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 14:54:21 +0200 Subject: [PATCH 2/4] RPi: remove commented-out bcm2835-driver reference Signed-off-by: Matthias Reichl --- projects/RPi/options | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/RPi/options b/projects/RPi/options index 1d9b20c142..777a1d5d1f 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -73,9 +73,6 @@ # for a list of additional drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS+=" DRIVER1 DRIVER2" -# Comment ADDITIONAL_PACKAGES below if using bcm2835-driver -# ADDITIONAL_DRIVERS+=" bcm2835-driver" - if [ "${ALSA_SUPPORT}" = "yes" ]; then ADDITIONAL_DRIVERS+=" rpi-cirrus-config" fi From e1affa9447202e48a5a3dd8e699d0ff3473f3d1b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 14:55:32 +0200 Subject: [PATCH 3/4] RPi: include dtc via ADDITIONAL_PACKAGES dtc used to be pulled in via bcm2835-driver, but that got lost in the switch to bcm2835-userland. Signed-off-by: Matthias Reichl --- projects/RPi/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/RPi/options b/projects/RPi/options index 777a1d5d1f..4f5b567441 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -86,7 +86,7 @@ DRIVER_ADDONS="crazycat dvb-latest" # additional packages to install: - ADDITIONAL_PACKAGES+=" bcm2835-userland bcm2835-utils" + ADDITIONAL_PACKAGES+=" bcm2835-userland bcm2835-utils dtc" # debug tty path DEBUG_TTY="/dev/console" From e9a1a0ecbf1a6f373c093ead4187d9654bd44186 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 20 Aug 2023 19:21:12 +0200 Subject: [PATCH 4/4] bcm2835-utils: update to 79ff2c4 Signed-off-by: Matthias Reichl --- packages/tools/bcm2835-utils/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/bcm2835-utils/package.mk b/packages/tools/bcm2835-utils/package.mk index 16ca95cb79..2fb3d3b083 100644 --- a/packages/tools/bcm2835-utils/package.mk +++ b/packages/tools/bcm2835-utils/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-utils" -PKG_VERSION="4e3333c62c202b0b12c3b881d3d9729efa66ca08" -PKG_SHA256="78f02f13304ccd14276c5b658087cc1805a690d41478df98e7ed0ba210f11352" +PKG_VERSION="79ff2c449915c138fcdd1eaf268fe618594649f3" +PKG_SHA256="7043ee3d1a53cfe02ee966f015db038bb5e489989c5d587e34fa9df4c850ae3a" PKG_ARCH="arm aarch64" PKG_LICENSE="BSD-3-Clause" PKG_SITE="https://github.com/raspberrypi/utils"