diff options
Diffstat (limited to 'meta-raspberrypi')
27 files changed, 89 insertions, 180 deletions
diff --git a/meta-raspberrypi/.github/workflows/yocto-builds.yml b/meta-raspberrypi/.github/workflows/yocto-builds.yml index 2d35b9f781..3dba5e9cbd 100644 --- a/meta-raspberrypi/.github/workflows/yocto-builds.yml +++ b/meta-raspberrypi/.github/workflows/yocto-builds.yml @@ -25,7 +25,7 @@ jobs: - raspberrypi4 - raspberrypi-cm3 - raspberrypi-cm - image: [core-image-base] + image: [rpi-test-image] distro: [poky] runs-on: [self-hosted, Linux] name: ${{ matrix.machine }}/${{ matrix.image }}/poky/systemd diff --git a/meta-raspberrypi/README.md b/meta-raspberrypi/README.md index a7a04b49f6..712b9a28c5 100644 --- a/meta-raspberrypi/README.md +++ b/meta-raspberrypi/README.md @@ -68,7 +68,7 @@ local_conf_header: To configure the machine, you have to update the `machine` variable. And the same for the `distro`. -For further information, you can read more at <https://kas.readthedocs.io/en/1.0/index.html> +For further information, you can read more at <https://kas.readthedocs.io/en/latest/index.html> ## Contributing diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index b25997ab74..a2edf064b6 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -39,6 +39,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/iqaudio-dacplus.dtbo \ overlays/mcp2515-can0.dtbo \ overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.dtbo \ overlays/miniuart-bt.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-capacitive.dtbo \ diff --git a/meta-raspberrypi/docs/conf.py b/meta-raspberrypi/docs/conf.py index 5c6ae4b064..e7a2491dde 100644 --- a/meta-raspberrypi/docs/conf.py +++ b/meta-raspberrypi/docs/conf.py @@ -50,7 +50,7 @@ master_doc = 'index' # General information about the project. project = 'meta-raspberrypi' -copyright = '2021, meta-raspberrypi contributors' +copyright = '2022, meta-raspberrypi contributors' author = 'meta-raspberrypi contributors' # The version info for the project you're documenting, acts as replacement for diff --git a/meta-raspberrypi/docs/layer-contents.md b/meta-raspberrypi/docs/layer-contents.md index 7383630c1e..d12cb88f81 100644 --- a/meta-raspberrypi/docs/layer-contents.md +++ b/meta-raspberrypi/docs/layer-contents.md @@ -23,8 +23,7 @@ Note: The raspberrypi3 machines include support for Raspberry Pi 3B+. layer and some media samples. For other uses it's recommended to base images on `core-image-minimal` or -`core-image-base` as appropriate. The old image names (`rpi-hwup-image` and -`rpi-basic-image`) are deprecated. +`core-image-base` as appropriate. ## WiFi and Bluetooth Firmware diff --git a/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb b/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb index dba63d9c49..fd67580f3f 100644 --- a/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb +++ b/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Python module to control the Raspberry Pi Sense HAT used in the Astro Pi mission" HOMEPAGE = "https://github.com/RPi-Distro/python-sense-hat" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=d80fe312e1ff5fbd97369b093bf21cda" inherit setuptools3 pypi diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index eca2664623..e5974e49d0 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 ?= "20220328" +RPIFW_DATE ?= "20220331" RPIFW_SRC_URI ?= "https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-firmware/raspberrypi-firmware_1.${RPIFW_DATE}.orig.tar.xz" RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "8ab5949b9da1e2a2da18acc203946698737efe3e5d98286dcb7a8b0d0e92564e" +SRC_URI[sha256sum] = "8758f10797bd52a7373cc5b39bd46d0d9f882d501ccb9535a72a3fe8a8d329c3" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch b/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch deleted file mode 100644 index 996ad10740..0000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 336d86ebd146905cf4384912f4f27699b6e37c72 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Sun, 29 Dec 2019 21:19:17 -0700 -Subject: [PATCH] dm: core: Move ofdata_to_platdata() call earlier - -This method is supposed to extract platform data from the device tree. It -should be done before the device itself is probed. Move it earlier in the -device_probe() function. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - drivers/core/device.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/core/device.c b/drivers/core/device.c -index 4e03708..291ff4c 100644 ---- a/drivers/core/device.c -+++ b/drivers/core/device.c -@@ -375,6 +375,13 @@ int device_probe(struct udevice *dev) - return 0; - } - -+ if (drv->ofdata_to_platdata && -+ (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -+ ret = drv->ofdata_to_platdata(dev); -+ if (ret) -+ goto fail; -+ } -+ - seq = uclass_resolve_seq(dev); - if (seq < 0) { - ret = seq; -@@ -411,13 +418,6 @@ int device_probe(struct udevice *dev) - goto fail; - } - -- if (drv->ofdata_to_platdata && -- (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -- ret = drv->ofdata_to_platdata(dev); -- if (ret) -- goto fail; -- } -- - /* Only handle devices that have a valid ofnode */ - if (dev_of_valid(dev)) { - /* --- -2.7.4 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index 4587d3da91..e50acf5fb3 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -6,9 +6,6 @@ SRC_URI:append:rpi = " \ SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch" -# special fix for raspberrypi-cm3 -SRC_URI:append:raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" - DEPENDS:append:rpi = " u-boot-default-script" do_install:append:rpi () { diff --git a/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb b/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb deleted file mode 100644 index 1bbbb50b3c..0000000000 --- a/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Base this image on core-image-minimal -include recipes-core/images/core-image-minimal.bb - -# Include modules in rootfs -IMAGE_INSTALL += " \ - kernel-modules \ - " - -SPLASH = "psplash-raspberrypi" - -IMAGE_FEATURES += "ssh-server-dropbear splash" - -do_image:prepend() { - bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead") -} diff --git a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb b/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb deleted file mode 100644 index eacec0ed49..0000000000 --- a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Base this image on core-image-minimal -include recipes-core/images/core-image-minimal.bb - -# Include modules in rootfs -IMAGE_INSTALL += " \ - kernel-modules \ - " - -do_image:prepend() { - bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead") -} diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb index 265dfc5095..ff8f8a4d62 100644 --- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -13,9 +13,13 @@ OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxpl RDEPENDS:${PN} = "\ ${OMXPLAYER} \ bcm2835-tests \ + raspi-gpio \ rpio \ rpi-gpio \ pi-blaster \ + python3-adafruit-circuitpython-register \ + python3-adafruit-platformdetect \ + python3-adafruit-pureio \ python3-rtimu \ connman \ connman-client \ diff --git a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb deleted file mode 100644 index 6538f6a03b..0000000000 --- a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Package that provides access to GPIO and other IO\ -functions on the Broadcom BCM 2835 chip, allowing access to the\ -GPIO pins on the 26 pin IDE plug on the RPi board" -SECTION = "base" -HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" -AUTHOR = "Mike McCauley (mikem@open.com.au)" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -COMPATIBLE_MACHINE = "^rpi$" - -SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz" - -SRC_URI[md5sum] = "b5dc426b4ff258bb1397442f98e40236" -SRC_URI[sha256sum] = "b9fd10f7a80aadaed28a77168709b7c519568a63b6e98d0a50e9c5fe31bea6bb" - -inherit autotools - -do_compile:append() { - # Now compiling the examples provided by the package - mkdir -p ${B}/examples - for file in `ls ${S}/examples`; do - ${CC} ${LDFLAGS} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src - done -} - -do_install:append() { - install -d ${D}/${libdir}/${BPN} - for file in ${B}/examples/* - do - install -m 0755 ${file} ${D}/${libdir}/${BPN} - done -} - -PACKAGES += "${PN}-tests" - -RDEPENDS:${PN}-dev = "" - -FILES:${PN} = "" -FILES:${PN}-tests = "${libdir}/${BPN}" -FILES:${PN}-dbg += "${libdir}/${BPN}/.debug" diff --git a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb new file mode 100644 index 0000000000..5171205427 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Package that provides access to GPIO and other IO\ +functions on the Broadcom BCM 2835 chip, allowing access to the\ +GPIO pins on the 26 pin IDE plug on the RPi board" +SECTION = "base" +HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" +AUTHOR = "Mike McCauley (mikem@open.com.au)" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e49f4652534af377a713df3d9dec60cb" + +COMPATIBLE_MACHINE = "^rpi$" + +SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz" + +SRC_URI[md5sum] = "9bd2d39bf4b3a9e81dce799ca51c826a" +SRC_URI[sha256sum] = "564920d205977d7e2846e434947708455d468d3a952feca9faef643abd03a227" + +inherit autotools + +do_compile:append() { + # Now compiling the examples provided by the package + mkdir -p ${B}/examples/spiram + for file in `ls ${S}/examples`; do + example="$file" + if [ "$file" = "spiram" ]; then + # This includes a tiny library + EXAMPLE_LDFLAGS="-L${B}/examples/spiram -lspiram" + example="spiram_test" + ${CC} ${CFLAGS} -c ${S}/examples/spiram/spiram.c -o ${B}/examples/spiram/libspiram.o -I${S}/src -I${S}/examples/spiram + rm -f ${B}/examples/spiram/libspiram.a && ${BUILD_AR} crD ${B}/examples/spiram/libspiram.a ${B}/examples/spiram/libspiram.o + fi + ${CC} ${LDFLAGS} ${S}/examples/${file}/${example}.c -o ${B}/examples/${example} -Bstatic -L${B}/src -lbcm2835 ${EXAMPLE_LDFLAGS} -I${S}/src + done +} + +do_install:append() { + install -d ${D}/${libdir}/${BPN} + for example in $(find ${B}/examples -type f -maxdepth 1) + do + install -m 0755 ${example} ${D}/${libdir}/${BPN} + done +} + +PACKAGES += "${PN}-tests" + +RDEPENDS:${PN}-dev = "" + +FILES:${PN} = "" +FILES:${PN}-tests = "${libdir}/${BPN}" +FILES:${PN}-dbg += "${libdir}/${BPN}/.debug" diff --git a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb index 1d21089350..d02fa92670 100644 --- a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb +++ b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspbe HOMEPAGE = "https://github.com/sarfata/pi-blaster/" SECTION = "devel/libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;beginline=268;endline=292;md5=86d10e4bcf4b4014d306dde7c1d2a80d" +LIC_FILES_CHKSUM = "file://README.md;beginline=295;endline=319;md5=86d10e4bcf4b4014d306dde7c1d2a80d" SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \ file://remove-initscript-lsb-dependency.patch \ @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \ S = "${WORKDIR}/git" -SRCREV = "befd8ef36e5066e4d444ef47fe4020787e541248" +SRCREV = "fbba9a7dcef0f352a11f8a2a5f6cbc15b62c0829" inherit update-rc.d autotools diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb index 1f745e73e9..1a609f5ea7 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git;branch=main;protocol=https" S = "${WORKDIR}/git" -SRCREV = "5fee6e0c3878110844bc51e16063eeae7d94c457" +SRCREV = "49ab415d6b601c99979262f9e91c21dcb3a927a7" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb index 170cd98643..e19b58e2dc 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c" SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git;branch=main;protocol=https" -SRCREV = "e0fe1b012898fa824944d6805ca74be0fa027968" +SRCREV = "7af3af87037cf1e6697471a3a83c56a0f852b959" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb index e38a483572..cdbe4b4b25 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009" SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git;branch=main;protocol=https" -SRCREV = "f4d0973da05b8b21905ff6bab69cdb652128f342" +SRCREV = "383b615ce9ff5bbefdf77652799f380016fda353" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb b/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb index 1afbb5f169..1afbb5f169 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb diff --git a/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch b/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch deleted file mode 100644 index bed97493d3..0000000000 --- a/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c86bfacc98d58244f532626954ed00d84ecfa82d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Jan 2016 17:12:37 -0800 -Subject: [PATCH] include sys/types.h explicitly for getting caddr_t definition - -Helps fixing build on musl where sys/types.h is not included indirectly -as happening on glibc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - source/c_gpio/c_gpio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source/c_gpio/c_gpio.c b/source/c_gpio/c_gpio.c -index 25a04ca..70df632 100644 ---- a/source/c_gpio/c_gpio.c -+++ b/source/c_gpio/c_gpio.c -@@ -29,6 +29,7 @@ - #include <stdint.h> - #include <stdlib.h> - #include <fcntl.h> -+#include <sys/types.h> - #include <sys/mman.h> - #include "c_gpio.h" - --- -2.7.0 - diff --git a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb index f75806e3f6..176646d2bf 100644 --- a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb +++ b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb @@ -3,12 +3,13 @@ GPIO interrups, TCP socket interrupts, command line tools and more" HOMEPAGE = "https://github.com/metachris/RPIO" SECTION = "devel/python" LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://README.rst;beginline=41;endline=53;md5=d5d95d7486a4d98c999675c23196b25a" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3ca60759f3202f1ae42e3519cd06bc" -PYPI_PACKAGE = "RPIO" -inherit pypi - -SRC_URI += "file://0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch" +SRC_URI = "\ + git://github.com/metachris/RPIO.git;protocol=https;branch=master \ + " +SRCREV = "be1942a69b2592ddacd9dc833d2668a19aafd8d2" +S = "${WORKDIR}/git" inherit setuptools3 diff --git a/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb b/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb index 02a3f5585b..8ea4be17d7 100644 --- a/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb +++ b/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb @@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "^rpi$" inherit autotools -SRCREV = "4edfde183ff3ac9ed66cdc015ae25e45f3a5502d" +SRCREV = "22b44e4765b4b78dc5b22394fff484e353d5914d" SRC_URI = "git://github.com/RPi-Distro/raspi-gpio.git;protocol=https;branch=master \ " diff --git a/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb index 2e3d1ccf19..b26e80e3e6 100644 --- a/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb @@ -39,7 +39,7 @@ do_extract_lic() { } # Must be before both do_install and do_populate_lic. Putting it before # their common ancestor works; other approaches do not. -addtask extract_lic after do_unpack before do_patch +addtask extract_lic after do_unpack before do_patch do_create_spdx do_compile() { : diff --git a/meta-raspberrypi/recipes-kernel/kmod/kmod_%.bbappend b/meta-raspberrypi/recipes-kernel/kmod/kmod_%.bbappend new file mode 100644 index 0000000000..db8b65c6bd --- /dev/null +++ b/meta-raspberrypi/recipes-kernel/kmod/kmod_%.bbappend @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: Andrei Gherzan <andrei@gherzan.com> +# +# SPDX-License-Identifier: MIT + +PACKAGECONFIG:append:rpi = " xz" diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index 95cd9c1647..ec59970657 100644 --- a/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -33,8 +33,8 @@ NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx-rpidistro] = "debian/config/brcm802 SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https" -SRCREV = "b3eec612566ca08913f0830d299f4df70297428f" -PV = "20210315-3+rpt3" +SRCREV = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc" +PV = "20210315-3+rpt4" S = "${WORKDIR}/git" @@ -58,6 +58,7 @@ do_install() { cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/brcm/${fw}.* ${D}${nonarch_base_libdir}/firmware/brcm/ done cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/ + rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt # add compat links. Fixes errors like # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-compute-module.txt failed with error -2 ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt @@ -79,10 +80,10 @@ LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro" FILES:${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENSE.broadcom_bcm43xx-rpidistro" -FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430* ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin" +FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430* ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob" FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*" FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*" -FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.*" +FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio*" FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license" RDEPENDS:${PN}-bcm43436 += "${PN}-broadcom-license" 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 6ea132dadf..8dade0b99f 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,8 +1,8 @@ -LINUX_VERSION ?= "5.10.95" +LINUX_VERSION ?= "5.10.110" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "a538fd26f82b101cb6fb963042f3242768e628d4" +SRCREV_machine = "89c0af71c9cf157a865afb526e9ebc21aadd531b" SRCREV_meta = "e1979ceb171bc91ef2cb71cfcde548a101dab687" KMETA = "kernel-meta" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb index 5b15d01c22..77d4a980a3 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb @@ -1,8 +1,8 @@ -LINUX_VERSION ?= "5.15.32" +LINUX_VERSION ?= "5.15.34" LINUX_RPI_BRANCH ?= "rpi-5.15.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15" -SRCREV_machine = "720e66a1a1f9bbe666cf1551cfd8d122640e9eca" +SRCREV_machine = "0086da6acd41600d47b87b05874f99704216426f" SRCREV_meta = "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" KMETA = "kernel-meta" |