From 636aaa195862ab9a5442c3178e38266debab3bff Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 15 Apr 2021 15:52:11 -0500 Subject: meta-raspberrypi: subtree update:d1f191ed30..bb974dc078 Khem Raj (4): mesa-gl: Use GALLIUMDRIVERS instead of DRIDRIVERS for passing swrast linux-raspberrypi-5.10: Upgrade to 5.10.25 raspberrypi-firmware: Update to 20210326 userland: Update to latest master Persian Prince (1): userland: Correct PV after SRCREV update Signed-off-by: Andrew Geissler Change-Id: I7abd7e2ac8a1d4fde1da6f2e7275a5cc98505b48 --- meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc | 6 +++--- meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend | 2 +- meta-raspberrypi/recipes-graphics/userland/userland_git.bb | 4 ++-- meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-raspberrypi') diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 5cebd7c3a..8bd93dda7 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20210225" -SRCREV ?= "5985247fb75681985547641d66196c77499f26b9" +RPIFW_DATE ?= "20210326" +SRCREV ?= "20081d8e86119e95e516526700be62049850c01a" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-firmware-${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "3e2c00e1473bd70e808134925e1b25cd765789d9f0e0683749135b124d835000" +SRC_URI[sha256sum] = "00bd758a1242f069682e1a98250362b45a8887aed98ee61dd50439e9a78fe463" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend index 84cd479af..e561a1b02 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1,7 +1,7 @@ PACKAGECONFIG_append_rpi = " gbm" PROVIDES_append_rpi = " virtual/libgbm" -DRIDRIVERS_append_rpi = ",swrast" +GALLIUMDRIVERS_append_rpi = ",swrast" do_install_append_rpi() { rm -rf ${D}${includedir}/KHR/khrplatform.h diff --git a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb index 6dfc8a373..ead81f078 100644 --- a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb +++ b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb @@ -13,11 +13,11 @@ COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "9f3f9054a692e53b60fca54221a402414e030335" +SRCREV = "3fd8527eefd8790b4e8393458efc5f94eb21a615" # Use the date of the above commit as the package version. Update this when # SRCREV is changed. -PV = "20201027" +PV = "20210319" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb index 56c7621d4..9fef701e2 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,7 +1,7 @@ -LINUX_VERSION ?= "5.10.17" +LINUX_VERSION ?= "5.10.25" LINUX_RPI_BRANCH ?= "rpi-5.10.y" -SRCREV_machine = "ec967eb45f8d4ed59bebafb5748da38118383be7" +SRCREV_machine = "d1fd8a5727908bb677c003d2ae977e9d935a6f94" SRCREV_meta = "5833ca701711d487c9094bd1efc671e8ef7d001e" KMETA = "kernel-meta" -- cgit v1.2.3