diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index f006c9c0c9..668619f18f 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b" diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 0e9c92b211..7af60d7e41 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 412d133633..cf48689dc7 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi4/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 8f879528a7..83b3b8479a 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6e787b87ace9f945f17a9022288e2758ed281cf7.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm" diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index e4b197f41c..d346fbd24d 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1 +1 @@ -sha256 c8d411ad15a393bbd25ca2c1e71ab0d26432e0f39eaac7d7c26f0c60e784ca09 rpi-firmware-56e23d83c456bf36eb798fcd7c7271675e082f1b.tar.gz +sha256 b3a8bd532ca38f90e322be9fe4858a974e04ba8254248e416bf9e9ec5f176d95 rpi-firmware-66bafab005569e3eb92ec54cd3efeee3da338738.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index defbee6a17..465d606b91 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 56e23d83c456bf36eb798fcd7c7271675e082f1b +RPI_FIRMWARE_VERSION = 66bafab005569e3eb92ec54cd3efeee3da338738 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/package/rpi-userland/0003-Disable-Werror-everywhere.patch b/package/rpi-userland/0003-Disable-Werror-everywhere.patch index 7fb2f97978..91effa3bcb 100644 --- a/package/rpi-userland/0003-Disable-Werror-everywhere.patch +++ b/package/rpi-userland/0003-Disable-Werror-everywhere.patch @@ -158,17 +158,6 @@ index fde18da..802c158 100755 # vc_vchi_gencmd.c has a type-punning problem in vc_gencmd_read_response add_definitions(-fno-strict-aliasing) -diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -index aed0e83..d834b3f 100644 ---- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -@@ -1,5 +1,5 @@ - --add_definitions(-Werror) -+add_definitions() - - # vcfiled - serves files to videocore. used for media handlers from - # OpenMAX/IL and loading VLLs. -- 2.19.0 diff --git a/package/rpi-userland/S94vcfiled b/package/rpi-userland/S94vcfiled deleted file mode 100644 index 4d27b91bae..0000000000 --- a/package/rpi-userland/S94vcfiled +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -NAME=vcfiled -DESC="VideoCore file server daemon $NAME" -DAEMON="/usr/sbin/$NAME" -DAEMON_ARGS="" -CFGFILE="/etc/default/$NAME" -PIDFILE="/var/run/$NAME.pid" - -# Read configuration variable file if it is present -[ -r "$CFGFILE" ] && . "$CFGFILE" - -start() -{ - printf "Starting $DESC: " - start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS && - echo "done" || echo "failed" -} - -stop() -{ - printf "Stopping $DESC: " - if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then - # This daemon does not remove its PID file when it exits. - rm -f "$PIDFILE" - echo "done" - else - echo "failed" - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 772e6b4e0d..6dd8e1fa94 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1 +1 @@ -sha256 6a39327563c3dd5c16803e3937812541f6b273aba6da78921bf89b10b2865bde rpi-userland-30c89b53f2aa1496c09096e241e7d79724561052.tar.gz +sha256 f0909d5fcdc53b9227e307b858ed695dcaa6dce7f90acee0de3cb9add4f8ad12 rpi-userland-2f85f2db007fb7b15ed1b485f42eae4cc6bc2bf4.tar.gz diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 427593f8e7..2ee2d98186 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,31 +4,16 @@ # ################################################################################ -RPI_USERLAND_VERSION = 30c89b53f2aa1496c09096e241e7d79724561052 +RPI_USERLAND_VERSION = 2f85f2db007fb7b15ed1b485f42eae4cc6bc2bf4 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) \ - -DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\"" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS)" RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg -ifeq ($(BR2_PACKAGE_RPI_USERLAND_START_VCFILED),y) -define RPI_USERLAND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \ - $(TARGET_DIR)/etc/init.d/S94vcfiled -endef -define RPI_USERLAND_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \ - $(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service -endef -endif - ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON @@ -54,9 +39,6 @@ RPI_USERLAND_CONF_OPTS += -DALL_APPS=OFF endif # BR2_PACKAGE_RPI_USERLAND_HELLO define RPI_USERLAND_POST_TARGET_CLEANUP - rm -f $(TARGET_DIR)/etc/init.d/vcfiled - rm -f $(TARGET_DIR)/usr/share/install/vcfiled - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install rm -Rf $(TARGET_DIR)/usr/src endef RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP diff --git a/package/rpi-userland/vcfiled.service b/package/rpi-userland/vcfiled.service deleted file mode 100644 index b09aa62774..0000000000 --- a/package/rpi-userland/vcfiled.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=VideoCore file server daemon - -[Service] -ExecStart=/usr/sbin/vcfiled --foreground -Restart=always - -[Install] -WantedBy=multi-user.target