subtree updates

meta-raspberrypi: 31c33d155c..cfbb192e5c:
  Andrei Gherzan (1):
        docs: Add information for RTC devices

  Andrew Penner (2):
        rpi-cmdline: Add ability to specify CPUs to add to the isolcpus list
        extra-build-config: Add documentation for the ISOLATED_CPUS configuration variable

  Jan Vermaete (1):
        docs: untabify the few tabs in the file

  Khem Raj (3):
        userland: Update to latest as of 20220323
        picamera-libs: Adjust sourcedir
        omxplayer: Use internal version of ffmpeg

meta-openembedded: af11f6ce73..b9e440ead8:
  Adrian Freihofer (1):
        srecord: build fix

  Andreas Müller (40):
        octave: upgrade 4.4.1 -> 6.4.0 and overhaul recipe
        mousepad: upgrade 0.5.8 -> 0.5.9
        xfce4-terminal: upgrade 0.8.10 -> 1.0.0
        orage: upgrade 4.12.1 -> 4.16.0
        orage: enable notify PACKAGECONFIG by default
        ristretto: upgrade 0.12.1 -> 0.12.2
        xarchiver: upgrade 0.5.4.14 -> 0.5.4.17
        xfce4-cpufreq-plugin: upgrade 1.2.5 -> 1.2.7
        xfce4-cpugraph-plugin: upgrade 1.2.5 -> 1.2.6
        xfce4-diskperf-plugin: upgrade 2.6.3 -> 2.7.0
        xfce4-notifyd: upgrade 0.6.2 -> 0.6.3
        xfce4-screenshooter: upgrade 1.9.9 -> 1.9.10
        xfce4-sensors-plugin: upgrade 1.4.2 -> 1.4.3
        Allow several components notification
        meta-xfce: Add Andreas Müller back to maintainers list
        accountsservice: upgrade 0.6.55 -> 22.08.8
        colord-gtk: upgrade 0.2.0 -> 0.3.0
        evince: upgrade 41.4 -> 42.1
        evolution-data-server: upgrade 3.43.1 -> 3.44.0
        file-roller: upgrade 3.40.0 -> 3.42.0
        gdm: upgrade 41.0 -> 42.0
        gedit: upgrade 41.0 -> 42.0
        gfbgraph: upgrade 0.2.4 -> 0.2.5
        gnome-calculator upgrade 41.1 -> 42-0
        libgweather4: initial add 4.0.0
        gnome-calendar 41.2 -> 42.0
        gnome-desktop: upgrade 41.2 -> 42.0
        libnma: upgrade 1.8.34 -> 1.8.36
        gnome-bluetooth4: initial add 42.0
        gnome-font-viewer: upgrade 41.0 -> 42.0
        yelp-xsl: upgrade 41.1 -> 42.0
        yelp-tools: upgrade 41.0 -> 42.0
        yelp: upgrade 41.2 -> 42.1
        upower: upgrade 0.99.13 -> 0.99.17 / build with mesom
        upower: fix location of udev-rules with sysvinit
        gnome-commander: initial add 1.14.2
        gnome-text-editor: initial add 42.0
        evolution-data-server: re-enable gobject-introspection
        jack: upgrade 1.19.19 -> 1.19.20
        fluidsynth: upgrade 2.2.4 -> 2.2.6

  Chen Qi (1):
        blueman: fix python site-packages installation issue

  Craig McQueen (1):
        dnsmasq: Fix a typo in initscript

  Davide Gardenal (2):
        python3-wxgtk4: add distro feature check to match dependency
        fwupd: add COMPATIBLE_HOST to match dependency

  Jose Quaresma (2):
        srt: 1.4.2 -> 1.4.3
        srt: 1.4.3 -> 1.4.4

  Khem Raj (2):
        xfce4-screenshooter: Add dependency on libxml-parser-perl-native
        open-vm-tools: Use specific BSD-2-Clause for license

  Matsunaga-Shinji (2):
        samba: add 2 cves to allowlist
        libzip: add CVE-2017-12858 to allowlist

  Minjae Kim (1):
        multipath-tools: update SRC_URI

  Potin Lai (1):
        libimobiledevice-glue: update recipe

  Robert Yang (2):
        wxwidgets: Fix checking for PACKAGECONFIG and DISTRO_FEATURES
        wxwidgets: git -> gitsm to fix build when no x11

  Samuli Piippo (1):
        python3-qface: upgrade 2.0.6 -> 2.0.7

  Xu Huan (5):
        python3-cheetah: upgrade 3.2.6.post2 -> 3.2.6
        python3-evdev: upgrade 1.4.0 -> 1.5.0
        python3-google-api-python-client: upgrade 2.36.0 -> 2.42.0
        python3-itsdangerous: upgrade 2.1.1 -> 2.1.2
        python3-grpcio: upgrade 1.44.0 -> 1.45.0

  Yi Zhao (1):
        dracut: upgrade 055 -> 056

  wangmy (20):
        python3-bitarray: upgrade 2.4.0 -> 2.4.1
        python3-click: upgrade 8.0.4 -> 8.1.2
        python3-cppy: upgrade 1.2.0 -> 1.2.1
        python3-pandas: upgrade 1.4.1 -> 1.4.2
        python3-protobuf: upgrade 3.19.4 -> 3.20.0
        python3-pychromecast: upgrade 10.3.0 -> 11.0.0
        python3-pyparted: upgrade 3.11.7 -> 3.12.0
        python3-redis: upgrade 4.2.0 -> 4.2.1
        python3-sqlalchemy: upgrade 1.4.32 -> 1.4.34
        python3-thrift: upgrade 0.15.0 -> 0.16.0
        python3-trafaret: upgrade 2.1.0 -> 2.1.1
        python3-twine: upgrade 3.8.0 -> 4.0.0
        python3-tzlocal: upgrade 4.1 -> 4.2
        python3-websocket-client: upgrade 1.3.1 -> 1.3.2
        python3-werkzeug: upgrade 2.0.3 -> 2.1.1
        zenity: upgrade 3.41.0 -> 3.42.0
        ceres-solver: upgrade 2.0.0 -> 2.1.0
        grpc: upgrade 1.45.0 -> 1.45.1
        poppler: upgrade 22.03.0 -> 22.04.0
        xorg-sgml-doctools: upgrade 1.11 -> 1.12

  zhengrq.fnst (2):
        python3-jdatetime: upgrade 4.0.0 -> 4.1.0
        python3-kiwisolver: upgrade 1.4.0 -> 1.4.2

meta-security: da93339112..498ca39cd6:
  Armin Kuster (5):
        openscap-daemon: use renamaed python_setuptools_build_meta
        python3-fail2ban: fix compile issue on some hosts
        lkrg-module: covert to git fetcher
        linux-yocto_security.inc: add lkrg kfrags
        samhain: update to 4.4.7

  Ashish Sharma (1):
        meta-security : Use SPDX style licensing format

  Davide Gardenal (2):
        clamav: add COMPATIBLE_HOST to fix build error
        fscrypt: update dependecy from go-dep-native to go-native

  Robert Yang (1):
        LICENSE: adopt SPDX standard names

poky: 1976521190..ed98f1a1ae:
  Abongwa Amahnui Bonalais (1):
        oe-init-build-env: add quotes around variables to prevent word splitting

  Alessio Igor Bogani (1):
        kernel.bbclass: Use KERNEL_IMAGEDEST instead of hardcoded boot path

  Alexandre Belloni (1):
        pseudo: Fix handling of absolute links

  Bruce Ashfield (6):
        linux-yocto/5.15: update to v5.15.32
        linux-yocto/5.10: update to v5.10.109
        linux-yocto/5.15: aufs: fixes and optimization
        linux-yocto-rt/5.15: aufs: compile fix
        linux-yocto/5.15: features/security: Move x86_64 configs to separate file
        linux-yocto/5.10: features/security: Move x86_64 configs to separate file

  Carlos Rafael Giani (1):
        libsdl2: Disable libunwind dependency in native builds

  Claudius Heine (1):
        os-release: add os-release-initrd package

  Ferry Toth (1):
        package_manager: sign DEB package feeds

  Joe Slater (1):
        unzip: fix CVE-2021-4217

  Khem Raj (1):
        glib-2.0: Backport patches C++ variant of g_atomic_int_compare_and_exchange()

  Oleksandr Kravchuk (1):
        tzdata: update to 2022a

  Peter Kjellerstedt (5):
        python3-jinja2: Correct HOMEPAGE
        insane.bbclass: Make do_qa_patch() depend on if patch-fuzz is in ERROR_QA
        insane.bbclass: Make changes to QA_EMPTY_DIRS trigger package_qa to rerun
        bitbake.conf: Remove ERROR_QA from BB_HASHEXCLUDE_COMMON
        bitbake: knotty.py: Show elapsed time also for tasks with progress bars

  Richard Purdie (11):
        bitbake: parse: Ensure any existing siggen is closed down first
        bitbake: data: Ensure vardepsexclude or BB_BASEHASH_IGNORE_VARS covers contains items
        bitbake: server/process: Disable gc around critical section
        bitbake: cooker: Reset and rebuild inotify watches
        bitbake: pyinotify: Handle potential latent bug
        mirrors: Switch glibc and binutils to use shallow mirror tarballs
        bitbake: data: Fix accidentally added parameter
        bitbake.conf: Drop unexports from a different era
        vim: Upgrade 8.2.4524 -> 8.2.4681
        Revert "meta: rust: Bug fix for target definitions returning 'NoneType'"
        build-appliance-image: Update to master head revision

  Robert Yang (1):
        waffle: The surfaceless-egl and gbm requires opengl

  Saul Wold (5):
        busybox: Exclude .debug from depmod
        kmod: Add an exclude directive to depmod
        depmodwrapper: Use nonarch_base_libdir for depmod.d
        kmod: Update exclude patch to Accepted
        depmodwrapper-cross: Fix missing $

  Sean Anderson (1):
        u-boot: Fix condition for install_spl_helper

  Simone Weiss (1):
        popt: add ptest

  Sundeep KOKKONDA (3):
        gcc: sanitizer: Fix tsan against glibc 2.34
        meta: rust: Bug fix for target definitions returning 'NoneType'
        meta: scripts - relocation script adapted to support big-endian machines

  Xavier Berger (1):
        gpg-sign: Add parameters to gpg signature function

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I294af706d7b96796ff360b402b9d011082cf36a7

7 files changed, 93 insertions, 18 deletions

diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md
index ab87637dfe..6c546794b7 100644
--- a/meta-raspberrypi/docs/extra-build-config.md
+++ b/meta-raspberrypi/docs/extra-build-config.md
@@ -278,6 +278,18 @@ the header extension should set the following in local.conf:
 
     ENABLE_DWC2_HOST = "1"
 
+## Set CPUs to be isolated from the standard Linux scheduler
+
+By default Linux will use all available CPUs for scheduling tasks. For real time
+purposes there can be an advantage to isolating one or more CPUs from the
+standard scheduler. It should be noted that CPU 0 is special, it is the only CPU
+available during the early stages of the boot process and cannot be isolated.
+
+The string assigned to this variable may be a single CPU number, a comma
+separated list ("1,2"), a range("1-3"), or a mixture of these ("1,3-5")
+
+    ISOLATED_CPUS = "1-2"
+
 ## Enable Openlabs 802.15.4 radio module
 
 When using device tree kernels, set this variable to enable the 802.15.4 hat:
@@ -290,13 +302,13 @@ See: <https://openlabs.co/OSHW/Raspberry-Pi-802.15.4-radio>
 
 In order to use CAN with an MCP2515-based module, set the following variables:
 
-	ENABLE_SPI_BUS = "1"
-	ENABLE_CAN = "1"
+    ENABLE_SPI_BUS = "1"
+    ENABLE_CAN = "1"
 
 In case of dual CAN module (e.g. PiCAN2 Duo), set following variables instead:
 
     ENABLE_SPI_BUS = "1"
-	ENABLE_DUAL_CAN = "1"
+    ENABLE_DUAL_CAN = "1"
 
 Some modules may require setting the frequency of the crystal oscillator used on the particular board. The frequency is usually marked on the package of the crystal. By default, it is set to 16 MHz. To change that to 8 MHz, the following variable also has to be set:
 
@@ -388,3 +400,23 @@ You may need to adjust volume and toggle switches that are off by default
     ```
 
 Audio capture on ReSpeaker 2 / 4 / 6 Mics Pi HAT from Seeed Studio is very noisy.
+
+## Support for RTC devices
+
+The RaspberryPi boards don't feature an RTC module and the machine
+configurations provided in this BSP layer have this assumption (until, if at
+all, some later boards will come with one).
+
+`rtc` is handled as a `MACHINE_FEATURES` in the context of the build system
+which means that if an attached device is provided for which support is needed,
+the recommended way forward is to write a new machine configuration based on an
+existing one. Check the documentation for
+`MACHINE_FEATURES_BACKFILL_CONSIDERED` for how this is disabled for the
+relevant machines.
+
+Even when `MACHINE_FEATURES` is tweaked to include the needed `rtc` string,
+make sure that your kernel configuration is supporting the attached device and
+the device tree is properly tweaked. Also, mind the runtime components that
+take advantage of your RTC device. You can do that by checking what is
+included/configured in the build system based on the inclusion of `rtc` in
+`MACHINE_FEATURES`.
diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb
index 50c2b53185..413ca4d527 100644
--- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb
+++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb
@@ -29,6 +29,18 @@ CMDLINE_LOGO ?= '${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nol
 # to enable kernel debugging.
 CMDLINE_DEBUG ?= ""
 
+# Add a request to isolate processors from the Linux scheduler. ISOLATED_CPUS
+# may have the form of a comma separated list of processor numbers "0,1,3", a
+# range "0-2", a combination of the two "0-1,3", or a single processor you may
+# not specify ALL processors simultaneously
+def setup_isolcpus(d):
+    string = ""
+    if d.getVar('ISOLATED_CPUS'):
+        string = 'isolcpus=' + d.getVar('ISOLATED_CPUS')
+    return string
+
+CMDLINE_ISOL_CPUS ?= "${@setup_isolcpus(d)}"
+
 # Add RNDIS capabilities (must be after rootwait)
 # example: 
 # CMDLINE_RNDIS = "modules-load=dwc2,g_ether g_ether.host_addr=<some MAC 
@@ -37,6 +49,7 @@ CMDLINE_DEBUG ?= ""
 CMDLINE_RNDIS ?= ""
 
 CMDLINE = " \
+    ${CMDLINE_ISOL_CPUS} \
     ${CMDLINE_DWC_OTG} \
     ${CMDLINE_SERIAL} \
     ${CMDLINE_ROOTFS} \
diff --git a/meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch b/meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch
new file mode 100644
index 0000000000..ff00d8b749
--- /dev/null
+++ b/meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch
@@ -0,0 +1,33 @@
+From 15fbe266af3dcc5b7660397204b06d04364a953a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 2 Apr 2022 21:37:42 -0700
+Subject: [PATCH] mmal: Do not use -Werror
+
+Clang warns about unused-but-set variables
+interface/mmal/vc/mmal_vc_api.c:395:18: error: variable 'status' set but not used [-We
+rror,-Wunused-but-set-variable]
+|    MMAL_STATUS_T status;
+|                  ^
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ interface/mmal/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt
+index 46f149d..c5c1642 100644
+--- a/interface/mmal/CMakeLists.txt
++++ b/interface/mmal/CMakeLists.txt
+@@ -3,7 +3,7 @@ if (NOT DEFINED LIBRARY_TYPE)
+ set(LIBRARY_TYPE SHARED)
+ endif (NOT DEFINED LIBRARY_TYPE)
+ 
+-add_definitions(-Wall -Werror)
++add_definitions(-Wall)
+ 
+ add_library(mmal SHARED util/mmal_util.c)
+ 
+-- 
+2.35.1
+
diff --git a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb
index 5676c31fb6..d8265d48fa 100644
--- a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb
+++ b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb
@@ -13,14 +13,15 @@ COMPATIBLE_MACHINE = "^rpi$"
 
 SRCBRANCH = "master"
 SRCFORK = "raspberrypi"
-SRCREV = "97bc8180ad682b004ea224d1db7b8e108eda4397"
+SRCREV = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e"
 
 # Use the date of the above commit as the package version. Update this when
 # SRCREV is changed.
-PV = "20210623"
+PV = "20220323"
 
 SRC_URI = "\
     git://github.com/${SRCFORK}/userland.git;protocol=https;branch=${SRCBRANCH} \
+    file://0001-mmal-Do-not-use-Werror.patch \
     file://0001-Allow-applications-to-set-next-resource-handle.patch \
     file://0002-wayland-Add-support-for-the-Wayland-winsys.patch \
     file://0003-wayland-Add-Wayland-example.patch \
@@ -67,7 +68,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',
 PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland"
 PACKAGECONFIG[allapps] = "-DALL_APPS=true,,,"
 
-CFLAGS:append = " -fPIC"
+CFLAGS:append = " -fPIC -Wno-unused-but-set-variable"
 
 do_install:append () {
 	for f in `find ${D}${includedir}/interface/vcos/ -name "*.h"`; do
diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
index dd1d4f3d70..e4946506a7 100644
--- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
+++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
@@ -15,10 +15,8 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
  Makefile.ffmpeg | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,9 +2,9 @@ CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
  
@@ -27,11 +25,11 @@ Index: git/Makefile
 +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
-+INCLUDES+=-I./ -Ilinux
++INCLUDES+=-I./ -Ilinux -I./ffmpeg
  
  DIST ?= omxplayer-dist
  STRIP ?= strip
-@@ -90,7 +90,7 @@ dist: omxplayer.bin omxplayer.1
+@@ -91,7 +91,7 @@ dist: omxplayer.bin omxplayer.1
  	cp COPYING $(DIST)/usr/share/doc/omxplayer
  	cp README.md $(DIST)/usr/share/doc/omxplayer/README
  	cp omxplayer.1 $(DIST)/usr/share/man/man1
@@ -40,10 +38,8 @@ Index: git/Makefile
  	cd $(DIST); tar -czf ../$(DIST).tgz *
  
  install:
-Index: git/Makefile.ffmpeg
-===================================================================
---- git.orig/Makefile.ffmpeg
-+++ git/Makefile.ffmpeg
+--- a/Makefile.ffmpeg
++++ b/Makefile.ffmpeg
 @@ -238,7 +238,8 @@ configure:
  			--disable-decoder=xbin \
  			--disable-decoder=idf \
diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
index 25196929f5..c15b40b4af 100644
--- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
+++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
@@ -7,7 +7,7 @@ SECTION = "console/utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=00a27da7ac0f9bcd17320ec29ef4bbf6"
 
-DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland"
+DEPENDS = "alsa-lib libpcre virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland"
 
 PR = "r5"
 
diff --git a/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb b/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb
index c1356f00ae..2ebe413942 100644
--- a/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb
+++ b/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://opt/vc/LICENCE;md5=86e53f5f5909ee66900418028de11780"
 
 include recipes-bsp/common/raspberrypi-firmware.inc
 
-S = "${WORKDIR}/firmware-${SRCREV}"
+S = "${WORKDIR}/raspberrypi-firmware-1.${PV}"
 
 do_install(){
     install -m 0755 -d ${D}${libdir}