diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-08 03:21:33 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 23:39:32 +0300 |
| commit | 213cb2696d00a85cd48d356cb5131824a302d828 (patch) | |
| tree | bfdf8fcdfef3a88e392ca3acfca6dec4dc836c9f /meta-raspberrypi | |
| parent | 40d8f44b51f83548f7ca8df062dd7435b784c0a8 (diff) | |
| download | openbmc-213cb2696d00a85cd48d356cb5131824a302d828.tar.xz | |
subtree updates
meta-raspberrypi: 8dc3a31088..c7f4c739a3:
Khem Raj (5):
linux-raspberrypi: Upgrade to 5.10.52
userland: Update to latest master branch
raspberrypi-firmware: Update to latest
raspberrypi-tools: Update to latest
sdcard_image-rpi.bbclass: Fix IMAGE_TYPEDEP override to use new syntax
Martin Jansa (4):
Convert to new override syntax
Manually fix conversion
layer.conf: Update to honister
userland: package man pages in PN-doc
Pierre-Jean Texier (2):
kas: local.conf: bump CONF_VERSION variable
kas: local.conf: disable prelink
poky: 17aabc0127..492205ea83:
Alexander Kanavin (17):
llvm: update 12.0.0 -> 12.0.1
systemd: update 248.3 -> 249.1
python3-testools: update 2.4.0 -> 2.5.0
libuv: update 1.41.0 -> 1.42.0
gnu-config: update to latest revision
vulkan-samples: update to latest revision
cmake: update 3.20.5 -> 3.21.0
cmake: update 3.21.0 -> 3.21.1
mtools: update 4.0.32 -> 4.0.34
util-linux: update 2.37 -> 2.37.1
iputils: update 20210202 -> 20210722
freetype: update 2.10.4 -> 2.11.0
devtool: print a warning on upgrades if PREFERRED_VERSION is set
rpm: do not RRECOMMEND rpm-build
selftest: add core-image-weston to no-gpl3-no-meta-gpl2 image test
shadow: update 4.8.1 -> 4.9
local.conf.sample: disable prelink
Bernhard Rosenkränzer (1):
gcc: update 11.1 -> 11.2
Bruce Ashfield (6):
linux-yocto/5.10: update to v5.10.53
linux-yocto/5.13: update to v5.13.5
linux-yocto/5.4: update to v5.4.135
linux-yocto-rt/5.10: update to -rt47
linux-yocto/5.13: enable TYPEC_TCPCI in usbc fragment
linux-yocto/5.10: enable TYPEC_TCPCI in usbc fragment
Changqing Li (1):
archiver.bbclass: fix do_ar_configured failure for kernel
Chen Qi (3):
zstd: fix CVE_PRODUCT
insane.bbclass: fix the file-rdeps QA message for the new override syntax
iputils: fix do_configure failure of missing ip command
Damian Wrobel (1):
rootfs: remove ldconfig auxiliary cache where appropriate
Denys Dmytriyenko (4):
meta: convert nested overrides leftovers to new syntax
convert-overrides.py: handle few more cases of overrides
libwpe: remove rpi-specific custom code
poky-tiny: drop uclibc override
Jon Mason (1):
parselogs.py: qemuarm should be qemuarmv5
Joshua Watt (4):
mesa: Fix v3d & vc4 dmabuf import
bitbake: bitbake: asyncrpc: Catch early SIGTERM
libxft: Fix bad PKG value
bitbake: contrib: vim: Update for new override syntax
Kai Kang (2):
u-boot_2021.07: set UBOOT_MACHINE for qemumips and qemumips64
python3-pytest: display correct version info
Kevin Hao (2):
meta-yocto-bsp: Introduce the v5.13 bbappend
meta-yocto-bsp: Bump to the v5.10.55
Khem Raj (10):
binutils: Upgrade to 2.37 branch
texinfo: Update gnulib to fix build with glibc 2.34
systemd: Fix build on musl
stress-ng: Drop defining daddr_t
stress-ng: Detemine minimal stack size via sysconf
mesa: Define a fallback for DRIDRIVERS
libssh2: Fix syntax for using ptest override
toaster-managed-mode.json: Correctly specify term with new override syntax
distrooverrides.bbclass: Correct override syntax
devtool.py: Correct override syntax
Lee Chee Yang (1):
aspell: fix CVE-2019-25051
Marek Vasut (2):
image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior
kernel-uboot: Handle gzip and lzo compression options
Martin Jansa (6):
convert-overrides.py: show processed file and version of this script
convert-overrides.py: remove base_dep_prepend and autotools_dep_prepend exception
convert-overrides.py: 0.9.1 include '(' as delimiter for shortvars
convert-overrides.py: allow specifying multiple target dirs
convert-overrides.py: allow dots before override in vars_re and shortvars_re
systemd-boot: use ld.bfd as efi-ld even when gold or lld is used in ${LD}
Matthias Klein (2):
runqemu: Fix typo in error message
runqemu: decouple bios and kernel options
Matthias Schiffer (3):
initscripts: populate-volatile.sh: do not log to tty0
initscripts: populate-volatile.sh: run create_file synchronously
initscripts: fix creation order for /var/log with VOLATILE_LOG_DIR=true
Michael Halstead (1):
releases: update to include 3.3.1
Michael Opdenacker (18):
oe-setup-builddir: update YP docs and OE URLs
conf-notes.txt: now suggesting to run 'runqemu qemux86-64'
test-manual: document LTO related reproducibility bug
quick start manual: update "source oe-init-build-env" output
dev-manual: fix wrong reference to class
documentation/README: improve BitBake manual referencing guidelines
manuals: simplify references to BitBake manual
manuals: remove explicit BitBake variable references
meta-skeleton: add recipe examples from documentation sources
bitbake: doc: bitbake-user-manual: fix syntax in example and improve description
bitbake: doc: bitbake-user-manual: update bitbake option help
bitbake: doc: bitbake-user-manual: grammar fix for the number of "metadata"
manuals: initial documentation for CVE management
ref-manual: remove example recipe source files
profile-manual: document how to build perf manpages on target
cve-check: fix comments
cve-check: update link to NVD website for CVE details
cve-check: improve comment about CVE patch file names
Mingli Yu (2):
perlcross: not break build if already patched
curl: Upgrade to 7.78.0
Nicolas Dechesne (4):
yocto-check-layer: improve missed dependencies
checklayer: new function get_layer_dependencies()
checklayer: rename _find_layer_depends
yocto-check-layer: ensure that all layer dependencies are tested too
Oleksandr Kravchuk (1):
bitbake.conf: change GNOME_MIRROR to new one
Patrick Williams (1):
pixman: re-disable iwmmxt
Paul Barker (4):
bitbake: asyncrpc: Fix bad message error in client
bitbake: asyncrpc: Set timeout when waiting for reply from server
bitbake: parse/ast: Substitute '~' when naming anonymous functions
kernel-yocto: Simplify no git repo case in do_kernel_checkout
Quentin Schulz (4):
bitbake: doc: Makefile: turn warnings into errors by default
bitbake: doc: bitbake-user-manual: ref-variables: order alphabetically the glossary sources
bitbake: doc: bitbake-user-manual: ref-variables: force glossary output to be alphabetically sorted
bitbake: doc: bitbake-user-manual: replace ``FOO`` by :term:`FOO` where possible
Richard Purdie (49):
Add MAINTAINERS.md file
yocto-check-layer: Remove duplicated code
libubootenv: Drop default-env RRECOMMENDS
bitbake: data_smart: Allow colon in variable expansion regex
meta-poky/meta-yocto-bsp: Convert to new override syntax
layer.conf: Update to honister
autotools/base/icecc: Remove prepend from function names
scripts/contrib: Add override conversion script
systemtap: Fix headers issue with x86 and 5.13 headers
migration-guides: Add start of 3.4 guide with override migration notes
common-tasks: Fix conversion error in npm example
bitbake: bitbake: Switch to using new override syntax
bitbake: doc/lib: Update to use new override syntax containing colons
bitbake: doc/lib: Add fixes for issues missed by the automated conversion
bitbake: bitbake: Update to version 1.51.1
layer.conf: Override changes mean we're only compatible with honister
Convert to new override syntax
meta: Manual override fixes
local.conf.sample: Bump version so users update their config
sanity.conf: Require bitbake 1.51.1
dropbear: Fix incorrect package override for postrm
convert-overrides: Allow script to handle patch/diffs
sdk: Decouple default install path from built in path
sstate: Fix rebuilds when changing layer config
populate_sdk_ext: Fix handling of TOOLCHAIN_HOST_TASK in the eSDK case
local.conf.sample: Bump version so users update their config
poky: Use SDKPATHINSTALL instead of SDKPATH
vim: Clarify where RDEPENDS/RRECOMMENDS apply
bitbake: data_smart: Fix inactive overide accidental variable value corruption
local.conf.sample: Fix missed override conversion
license: Exclude COPYING.MIT from pseudo
meta: Convert IMAGE_TYPEDEP to use override syntax
uboot-extlinux-config: Fix missing override conversion
image/image_types: Convert CONVERSION_CMD/COMPRESS_CMD to new override syntax
image: Drop COMPRESS_CMD
devupstream: Allow support of native class extensions
diffoscope: Upgrade 178 -> 179
strace: Upgrade 5.12 -> 5.13
valgrind: Add patches for glibc 2.34 support
bitbake: runqueue: Improve multiconfig deferred task issues
elfutils: Add patch from upstream for glibc 2.34 ptest fixes
bitbake: doc: Fix append/prepend/remove references
bitbake: fetch/tests/toaster: Override conversion fixups
bitbake: process: Improve traceback error reporting from main loop
bitbake: command: Ensure we catch/handle exceptions
bitbake: ui/taskexp: Improve startup exception handling
bitbake: ui/taskexp: Fix to work with empty build directories
oeqa/runtime/cases/ptest: Increase test timeout from 300s to 450s
packagedata: Fix after override syntax change
Ross Burton (2):
glew: fix Makefile race
libx11: fix xkb compilation with _EVDEVK symbols
Saul Wold (1):
MAINTAINERS: Saul will cover devtool and eSDK
Stefan Wiehler (1):
dev-manual: fix source release example script
Stefano Babic (1):
mtd-utils: upgrade 2.1.2 -> 2.1.3
Tim Orling (2):
python3-hypothesis: upgrade 6.14.3 -> 6.14.5
python3-importlib-metadata: upgrade 4.6.1 -> 4.6.3
Tony Battersby (2):
lto.inc: disable LTO for grub
gcc: Backport patch to make LTO builds more reproducible
Tony Tascioglu (6):
ffmpeg: fix-CVE-2020-20446
ffmpeg: fix CVE-2020-20453
ffmpeg: fix CVE-2020-22015
ffmpeg: fix CVE-2020-22021
ffmpeg: fix CVE-2020-22033 and CVE-2020-22019
ffmpeg: fix CVE-2021-33815
Trevor Woerner (1):
ffmpeg: add libatomic for armv5
Ulrich Ölmann (2):
initramfs-framework: fix whitespace issue
initramfs-framework/setup-live: fix shebang
Vinay Kumar (1):
glibc: Fix CVE-2021-33574
Vivien Didelot (1):
init-manager-systemd: define weak dev manager
Zqiang (1):
python3: use monotonic clock for condvar if possible
hongxu (1):
createrepo-c: fix createrepo-c failed in nativesdk
leimaohui (1):
archiver.bbclass: Fix patch error for recipes that inherit dos2unix.
wangmy (3):
bind: upgrade 9.16.18 -> 9.16.19
i2c-tools: upgrade 4.2 -> 4.3
diffoscope: upgrade 177 -> 178
zangrc (2):
python3-dbus: upgrade 1.2.16 -> 1.2.18
python3-pip: upgrade 21.1.3 -> 21.2.1
meta-openembedded: 8fbcfb9f02..3cf2475ea0:
Anastasios Kavoukis (1):
pm-qa: fix paths for shell scripts
Andreas Müller (3):
mozjs/0001-Port-build-to-python3.patch: Fix typos in description
jack: upgrade 1.19.18 -> 1.19.19
fluidsynth: upgrade 2.2.1 -> 2.2.2
Andrej Valek (1):
thrift: upgrade to 0.14.2
Andrew Jeffery (2):
python3-gmpy: Add native support
python3-ecdsa: Add native support
Armin Kuster (2):
hiawatha: fix url.
wireshark: update to 3.4.7
Ben Brown (1):
android-tools: fix install of adb client when TOOLS is overridden
Changqing Li (1):
apache2: upgrade 2.4.46 -> 2.4.48
Devendra Tewari (1):
Suppress eol in functionfs setup scripts (#147)
Gianfranco (1):
vboxguestdrivers: upgrade 6.1.22 -> 6.1.24
Joe Slater (2):
php: move to version 7.4.21
gtksourceview4: work around dependency deficiency
Johannes Obermüller (1):
evtest: fix timestamps in output
Kai Kang (2):
python3-blivet: 3.1.4 -> 3.4.0
python3-blivetgui: 2.1.10 -> 2.2.1
Khem Raj (23):
netperf: Update to latest
netperf: Add systemd unit file
packagegroup-meta-oe: Add lmdb
packagegroup-meta-oe: Add mbw
addcli: check for ns_get16 and ns_get32
fuse: Define closefrom if not available
autofs: Fix build with glibc 2.34+
ntp: Do not use PTHREAD_STACK_MIN on glibc
ntp: Fix make check
mongodb: Upgrade to 4.4.7
vboxguestdrivers: Remove __divmoddi4 patch
packagegroup-meta-oe: Add jemalloc
apitrace: Exclude from builds with glibc 2.34+
libhugetlbfs: Disable build with glibc 2.34+
fvwm: Package extra files and man pages
luajit: Fix override syntax
lua: Drop uclibc patch
packagegroup-meta-oe: Correct override name and fix syntax
recipes: Fix override syntax
emacs,libgpiod,cockpit: Fix override syntax in using FILES_${PN}
fvwm: Fix build time paths in target perl/python scripts
nis: Drop uclibc check in anon python function
jemalloc: Fix build on musl
Leon Anavi (3):
python3-networkx: Upgrade 2.6.1 -> 2.6.2
python3-pysonos: Upgrade 0.0.53 -> 0.0.54
python3-zeroconf: Upgrade 0.33.1 -> 0.33.2
Li Wang (1):
openlldp: fix segfault
Maksym Sloyko (1):
libusbgx: Configure the Devices Used
Martin Jansa (5):
Convert to new override syntax
layer.conf: Update to honister
mariadb: manually fix the conversion
packagegroup-meta-oe: manually finish override syntax conversion
klibc.bbclass, image_types_sparse.bbclass, packagegroup-meta-oe.bb: update the overrides syntax conversion
Mingli Yu (4):
mariadb: redefine log-error item
jemalloc: add new recipe
hdf5: improve reproducibility
mariadb: Update SRC_URI
Nicolas Dechesne (1):
mbw: add new recipe
Paulo Neves (1):
htop: Add ncurses-terminfo-base to RDEPENDS
Sakib Sajal (1):
lmdb: add recipe
Salman Ahmed (2):
nginx: upgrade 1.18.0 -> 1.20.1
nginx: upgrade 1.19.6 -> 1.21.1
Tony Battersby (1):
net-snmp: fix QA Issue after LDFLAGS change
Yi Zhao (3):
postfix: upgrade 3.6.1 -> 3.6.2
audit: upgrade 3.0.2 -> 3.0.3
audit: fix compile error for 2.8.5
Zang Ruochen (1):
python3-robotframework: upgrade 4.0.3 -> 4.1
wangmy (17):
evince: upgrade 40.2 -> 40.4
gnome-backgrounds: upgrade 3.36.0 -> 3.38.0
gnome-desktop3: upgrade 3.36.6 -> 3.38.8
cmark: upgrade 0.30.0 -> 0.30.1
ctags: upgrade 5.9.20210711.0 -> 5.9.20210718.0
libnet-dns-perl: upgrade 1.31 -> 1.32
libtalloc: upgrade 2.3.2 -> 2.3.3
nghttp2: upgrade 1.43.0 -> 1.44.0
bats: upgrade 1.3.0 -> 1.4.1
networkmanager: upgrade 1.32.2 -> 1.32.4
gensio: upgrade 2.2.7 -> 2.2.8
libmbim: upgrade 1.24.8 -> 1.26.0
fetchmail: upgrade 6.4.19 -> 6.4.20
ctags: upgrade 5.9.20210718.0 -> 5.9.20210801.0
libblockdev: upgrade 2.25 -> 2.26
libqmi: upgrade 1.28.6 -> 1.28.8
monit: upgrade 5.28.0 -> 5.28.1
zangrc (15):
python3-qrcode: upgrade 7.1 -> 7.2
python3-rdflib: upgrade 5.0.0 -> 6.0.0
python3-simplejson: upgrade 3.17.2 -> 3.17.3
python3-bitstring: upgrade 3.1.7 -> 3.1.9
python3-iso8601: upgrade 0.1.14 -> 0.1.16
python3-gmqtt: upgrade 0.6.9 -> 0.6.10
python3-graphviz: upgrade 0.16 -> 0.17
python3-smbus: upgrade 4.2 -> 4.3
python3-pandas: upgrade 1.3.0 -> 1.3.1
python3-progress: upgrade 1.5 -> 1.6
python3-sentry-sdk: upgrade 1.3.0 -> 1.3.1
python3-socketio: upgrade 5.3.0 -> 5.4.0
python3-tqdm: upgrade 4.61.2 -> 4.62.0
python3-twisted: upgrade 21.2.0 -> 21.7.0
python3-xlsxwriter: upgrade 1.4.4 -> 1.4.5
zhengruoqin (15):
live555: upgrade 20210710 -> 20210720
libtest-warnings-perl: upgrade 0.030 -> 0.031
python3-pybind11: upgrade 2.6.2 -> 2.7.0
python3-pymongo: upgrade 3.11.4 -> 3.12.0
python3-sqlalchemy: upgrade 1.4.20 -> 1.4.22
python3-sentry-sdk: upgrade 1.2.0 -> 1.3.0
libcurses-perl: upgrade 1.37 -> 1.38
libdbd-sqlite-perl: upgrade 1.66 -> 1.68
libencode-perl: upgrade 3.10 -> 3.11
python3-bitarray: upgrade 2.2.2 -> 2.2.3
python3-cbor2: upgrade 5.4.0 -> 5.4.1
python3-gast: upgrade 0.5.0 -> 0.5.1
poppler: upgrade 21.07.0 -> 21.08.0
valijson: upgrade 0.4 -> 0.5
xwd: upgrade 1.0.7 -> 1.0.8
meta-security: 152cdb506b..c885d399cd:
Armin Kuster (18):
suricata.inc: exclude ppc in rust version
suricata: Drop 4.1.x its EOL
add meta-rust
crowdsec: add pkg
packagegroup-core-security.bb: fix suricat-ptest inclusion
gitlab-ci.yml: streamline builds matrix
krill: Add new pkg
clamav: fix branch name and update
meta-security: Convert to new override syntax
meta-tpm: Convert to new override syntax
meta-integrity: Convert to new override syntax
meta-hardening: Convert to new override syntax
meta-security-isafw: Convert to new override syntax
meta-parsec: Convert to new override syntax
meta-security-compliance: Convert to new override syntax
dynamix-layers: Convert to new override syntax
kas: Convert to new override syntax
packagegroup-core-security.bb: only include suricat-ptest if rust is included
Martin Jansa (1):
layer.conf: Update to honister
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iec7301cf1c43b7cec462dcf88292a8b1b12a5045
Diffstat (limited to 'meta-raspberrypi')
65 files changed, 201 insertions, 197 deletions
diff --git a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass index e803a0da95..a3a693960a 100644 --- a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass +++ b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass @@ -23,12 +23,12 @@ inherit image_types # 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS # This image depends on the rootfs image -IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" +IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" # Kernel image name -SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img" -SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" -SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" +SDIMG_KERNELIMAGE:raspberrypi ?= "kernel.img" +SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img" +SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img" # Boot partition volume id # Shorten raspberrypi to just rpi to keep it under 11 characters @@ -87,7 +87,7 @@ def split_overlays(d, out, ver=None): return overlays -IMAGE_CMD_rpi-sdimg () { +IMAGE_CMD:rpi-sdimg () { # Align partitions BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index 2518379ae7..7f634aeae7 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "hardknott honister" +LAYERSERIES_COMPAT_raspberrypi = "honister" LAYERDEPENDS_raspberrypi = "core" # Additional license directories. @@ -36,5 +36,5 @@ BBFILES_DYNAMIC += " \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \ " -DEFAULT_TEST_SUITES_remove_rpi = "parselogs" -DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" +DEFAULT_TEST_SUITES:remove:rpi = "parselogs" +DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi" diff --git a/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc index 75c37271ac..a4db93805b 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -144,4 +144,4 @@ do_image_wic[recrdeps] = "do_build" # The kernel image is installed into the FAT32 boot partition and does not need # to also be installed into the rootfs. -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc b/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc index bb18496c9d..b788f146fc 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc @@ -5,5 +5,5 @@ IMAGE_CLASSES += "sdcard_image-rpi" # RPI kernel has errors of its own which should be filtered # therefore use parselogs_rpi test instead of parselogs from oe-core # -DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" -DEFAULT_TEST_SUITES_remove_rpi = " parselogs" +DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi" +DEFAULT_TEST_SUITES:remove:rpi = " parselogs" diff --git a/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc b/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc index b9e0377fda..ce5f08ea7f 100644 --- a/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc +++ b/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc @@ -7,11 +7,11 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', ' -mcpu=arm MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" AVAILTUNES += "arm1176jzfs" -ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" -TUNE_FEATURES_tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1176jzfs" +ARMPKGARCH:tune-arm1176jzfs = "arm1176jzfs" +TUNE_FEATURES:tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" +PACKAGE_EXTRA_ARCHS:tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1176jzfs" AVAILTUNES += "arm1176jzfshf" -ARMPKGARCH_tune-arm1176jzfshf = "${ARMPKGARCH_tune-arm1176jzfs}" -TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} arm1176jzfshf-vfp" +ARMPKGARCH:tune-arm1176jzfshf = "${ARMPKGARCH:tune-arm1176jzfs}" +TUNE_FEATURES:tune-arm1176jzfshf = "${TUNE_FEATURES:tune-arm1176jzfs} callconvention-hard" +PACKAGE_EXTRA_ARCHS:tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} arm1176jzfshf-vfp" diff --git a/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md index ec3bd6ab80..f52c51f2db 100644 --- a/meta-raspberrypi/docs/extra-build-config.md +++ b/meta-raspberrypi/docs/extra-build-config.md @@ -159,7 +159,7 @@ command (eg. bootz) to be used. To build an initramfs image: -* Set this 3 kernel variables (in kernel's do_configure_prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\"" +* Set this 3 kernel variables (in kernel's do_configure:prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\"" ) - kernel_configure_variable BLK_DEV_INITRD y - kernel_configure_variable INITRAMFS_SOURCE "" @@ -195,7 +195,7 @@ by tasks that image building task must depend upon, to ensure that the files are available when they are needed, so these component deploy tasks must be added to: RPI_SDIMG_EXTRA_DEPENDS. - RPI_SDIMG_EXTRA_DEPENDS_append = " example:do_deploy" + RPI_SDIMG_EXTRA_DEPENDS:append = " example:do_deploy" ## Enable SPI bus @@ -211,7 +211,7 @@ When using device tree kernels, set this variable to enable I2C: Furthermore, to auto-load I2C kernel modules set: - KERNEL_MODULE_AUTOLOAD_rpi += "i2c-dev i2c-bcm2708" + KERNEL_MODULE_AUTOLOAD:rpi += "i2c-dev i2c-bcm2708" ## Enable PiTFT support diff --git a/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend b/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend index 5d3ab4dfd3..22f8ce4107 100644 --- a/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend +++ b/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://lirc-gpio-ir-0.10.patch \ file://lircd.service \ " diff --git a/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend b/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend index 63fedbb542..777653169c 100644 --- a/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend +++ b/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN} += "python3-sense-hat" +RDEPENDS:${PN} += "python3-sense-hat" 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 6195d284bc..dba63d9c49 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 @@ -17,7 +17,7 @@ DEPENDS += " \ freetype \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-numpy \ ${PYTHON_PN}-rtimu \ ${PYTHON_PN}-pillow \ diff --git a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend index 8076ac79e8..2721cfe778 100644 --- a/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend +++ b/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend @@ -1,2 +1,2 @@ PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi" -PACKAGECONFIG_append_rpi = " raspberrypi" +PACKAGECONFIG:append:rpi = " raspberrypi" diff --git a/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend b/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend index 933aaf6c42..d15f34ce9c 100644 --- a/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend +++ b/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_rpi = "(null)" +COMPATIBLE_MACHINE:rpi = "(null)" diff --git a/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 25423d0888..8d458c815f 100644 --- a/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1 +1 @@ -RDEPENDS_packagegroup-meta-oe-kernel_remove_rpi = "bpftool" +RDEPENDS:packagegroup-meta-oe-kernel:remove:rpi = "bpftool" diff --git a/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index e48f31d117..6d3de3f8a7 100644 --- a/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,19 +1,19 @@ -PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ +PACKAGECONFIG_GL:rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" -PACKAGECONFIG_GL_append_rpi = " gbm" -PACKAGECONFIG_FONTS_rpi = "fontconfig" -PACKAGECONFIG_append_rpi = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rpi = "tests" +PACKAGECONFIG_GL:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" +PACKAGECONFIG_GL:append:rpi = " gbm" +PACKAGECONFIG_FONTS:rpi = "fontconfig" +PACKAGECONFIG:append:rpi = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove:rpi = "tests" -OE_QTBASE_EGLFS_DEVICE_INTEGRATION_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" +OE_QTBASE_EGLFS_DEVICE_INTEGRATION:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" -do_configure_prepend_rpi() { +do_configure:prepend:rpi() { # Add the appropriate EGLFS_DEVICE_INTEGRATION if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri fi } -RDEPENDS_${PN}_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +RDEPENDS:${PN}:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" diff --git a/meta-raspberrypi/kas-poky-rpi.yml b/meta-raspberrypi/kas-poky-rpi.yml index 3e43e2e755..2ab4770a4a 100644 --- a/meta-raspberrypi/kas-poky-rpi.yml +++ b/meta-raspberrypi/kas-poky-rpi.yml @@ -42,10 +42,10 @@ local_conf_header: reduce_diskspace: | INHERIT += "rm_work_and_downloads" standard: | - CONF_VERSION = "1" + CONF_VERSION = "2" PACKAGE_CLASSES = "package_rpm" SDKMACHINE = "x86_64" - USER_CLASSES = "buildstats image-prelink" + USER_CLASSES = "buildstats" PATCHRESOLVE = "noop" debug-tweaks: | EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb index e84456c7ad..c1c5340cc1 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb @@ -261,7 +261,7 @@ do_deploy() { fi } -do_deploy_append_raspberrypi3-64() { +do_deploy:append:raspberrypi3-64() { echo "# have a properly sized image" >> $CONFIG echo "disable_overscan=1" >> $CONFIG diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 891bd1ac32..49494dcb96 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 ?= "20210527" -SRCREV ?= "1eb8921ae7158249894f89e8bb6c4bfb04ec7377" +RPIFW_DATE ?= "20210727" +SRCREV ?= "e83f41345103a7fec73ccc5a2970d1812de77cdf" 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] = "32fb5cc72703247622839c3cb4df2f369f91d2185770df867ac9758283bf5380" +SRC_URI[sha256sum] = "e7bd4532ac913663b5a8bf2644277208f3fc48e8136ddc84dad7ce1b62e4c37d" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc index 7879c0af5f..29de2cdc2e 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc @@ -1,9 +1,9 @@ -RPITOOLS_DATE ?= "20201008" -SRCREV ?= "fc0e73c13865450e95edd046200e42a6e52d8256" +RPITOOLS_DATE ?= "20210705" +SRCREV ?= "2e59fc67d465510179155973d2b959e50a440e47" RPITOOLS_SRC_URI ?= "https://github.com/raspberrypi/tools/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-tools-${SRCREV}.tar.gz" RPITOOLS_S ?= "${WORKDIR}/tools-${SRCREV}" SRC_URI = "${RPITOOLS_SRC_URI}" -SRC_URI[sha256sum] = "05217b942150830225e8ee04a8f16b8ecc2ffbbe5dd815541b15333f783e805e" +SRC_URI[sha256sum] = "77b0d2350d5f1d7003cbfa68db5318241caec3e1b5e499d65673ec6d987dcb1a" PV = "${RPITOOLS_DATE}" diff --git a/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend b/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend index 72d991c7e5..4fc41d0580 100644 --- a/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index cdfe5bb8ba..154309e7fe 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,15 +1,15 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://fw_env.config \ " # special fix for raspberrypi-cm3 -SRC_URI_append_raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" +SRC_URI:append:raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" -DEPENDS_append_rpi = " u-boot-default-script" +DEPENDS:append:rpi = " u-boot-default-script" -do_install_append_rpi () { +do_install:append:rpi () { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } diff --git a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend index d1a07a4612..09d410350b 100644 --- a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = "\ +SRC_URI:append:rpi = "\ file://0001-bcm43xx-Add-bcm43xx-3wire-variant.patch \ file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \ file://0003-Increase-firmware-load-timeout-to-30s.patch \ file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \ " -RDEPENDS_${PN}_append_rpi = " pi-bluetooth" +RDEPENDS:${PN}:append:rpi = " pi-bluetooth" diff --git a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb index a1eb97fe80..c91e3c5d02 100644 --- a/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb +++ b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" # hciuart.service replaces what was brcm43438.service inherit systemd -SYSTEMD_SERVICE_${PN} = "\ +SYSTEMD_SERVICE:${PN} = "\ hciuart.service \ bthelper@.service \ " @@ -36,12 +36,12 @@ do_install() { fi } -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir} \ ${sysconfdir} \ ${systemd_unitdir}/system \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ udev-rules-rpi \ " diff --git a/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb b/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb index 77a3d7b2b4..1bbbb50b3c 100644 --- a/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb +++ b/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb @@ -10,6 +10,6 @@ SPLASH = "psplash-raspberrypi" IMAGE_FEATURES += "ssh-server-dropbear splash" -do_image_prepend() { +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 index 86e9b6daf7..eacec0ed49 100644 --- a/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb +++ b/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb @@ -6,6 +6,6 @@ IMAGE_INSTALL += " \ kernel-modules \ " -do_image_prepend() { +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/images/rpi-test-image.bb b/meta-raspberrypi/recipes-core/images/rpi-test-image.bb index c2f5f73209..360b20dc75 100644 --- a/meta-raspberrypi/recipes-core/images/rpi-test-image.bb +++ b/meta-raspberrypi/recipes-core/images/rpi-test-image.bb @@ -3,4 +3,4 @@ include recipes-core/images/core-image-base.bb COMPATIBLE_MACHINE = "^rpi$" -IMAGE_INSTALL_append = " packagegroup-rpi-test" +IMAGE_INSTALL:append = " packagegroup-rpi-test" diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend index 500d871e4b..1cc1dfc45f 100644 --- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend +++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend @@ -1,2 +1,2 @@ # mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver -X11GLTOOLS_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" +X11GLTOOLS:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" diff --git a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb index a3f4ac9ae9..265dfc5095 100644 --- a/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -10,7 +10,7 @@ COMPATIBLE_MACHINE = "^rpi$" OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${OMXPLAYER} \ bcm2835-tests \ rpio \ @@ -23,7 +23,7 @@ RDEPENDS_${PN} = "\ bluez5 \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \ ${MACHINE_EXTRA_RRECOMMENDS} \ " diff --git a/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend index 41622aa506..bf99b2bff7 100644 --- a/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend +++ b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SPLASH_IMAGES_rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SPLASH_IMAGES:rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" diff --git a/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb b/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb index ae35521d43..d5d4589d64 100644 --- a/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb +++ b/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb @@ -10,4 +10,4 @@ do_install () { install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d } -FILES_${PN} = "${base_libdir}/udev/rules.d" +FILES:${PN} = "${base_libdir}/udev/rules.d" diff --git a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb index eef6afd1c3..87252bb131 100644 --- a/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb +++ b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "b9fd10f7a80aadaed28a77168709b7c519568a63b6e98d0a50e9c5fe31 inherit autotools -do_compile_append() { +do_compile:append() { # Now compiling the examples provided by the package mkdir -p ${B}/examples for file in `ls ${S}/examples`; do @@ -25,7 +25,7 @@ do_compile_append() { done } -do_install_append() { +do_install:append() { install -d ${D}/${libdir}/${BPN} for file in ${B}/examples/* do @@ -35,8 +35,8 @@ do_install_append() { PACKAGES += "${PN}-tests" -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" -FILES_${PN} = "" -FILES_${PN}-tests = "${libdir}/${BPN}" -FILES_${PN}-dbg += "${libdir}/${BPN}/.debug" +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 fdaf16c8ff..4aa7427c22 100644 --- a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb +++ b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb @@ -15,8 +15,8 @@ SRCREV = "befd8ef36e5066e4d444ef47fe4020787e541248" inherit update-rc.d autotools INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "${PN}.boot.sh" -INITSCRIPT_PARAMS_${PN} = "defaults 15 85" +INITSCRIPT_NAME:${PN} = "${PN}.boot.sh" +INITSCRIPT_PARAMS:${PN} = "defaults 15 85" COMPATIBLE_MACHINE = "^rpi$" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb index dc9e6802b3..4659ad9666 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -do_install_append() { +do_install:append() { # it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt # 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then @@ -20,11 +20,11 @@ do_install_append() { fi } -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libgpiod \ python3-adafruit-platformdetect \ python3-adafruit-pureio \ python3-core \ " -RDEPENDS_${PN}_append_rpi = " rpi-gpio" +RDEPENDS:${PN}:append:rpi = " rpi-gpio" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb index 7c1a26742e..7cccd5820b 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-core \ " diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb index b0475e6efd..c5da4ac611 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-core \ " diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb index 12a63f3a59..eacca3edd7 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-adafruit-circuitpython-busdevice \ python3-adafruit-circuitpython-motor \ diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb index a46b13044c..23cd786c67 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-adafruit-circuitpython-busdevice \ python3-adafruit-circuitpython-register \ 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.4.bb index 7d0377b49d..ccf5eaa646 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.4.bb @@ -12,4 +12,4 @@ DEPENDS += "python3-setuptools-scm-native" inherit setuptools3 -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" 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.1.1.bb index 0574c532a5..b88affa090 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb @@ -12,4 +12,4 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" 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.8.bb index a59e6f5738..63c7166a2b 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.8.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-core \ python3-ctypes \ python3-fcntl \ diff --git a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb index d5653cb0db..1c8075f3e2 100644 --- a/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb +++ b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb @@ -14,7 +14,7 @@ inherit setuptools3 COMPATIBLE_MACHINE = "^rpi$" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ python3-logging \ python3-threading \ " diff --git a/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend b/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend index 7ba13e2099..5efd8fc5f7 100644 --- a/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend @@ -1,3 +1,3 @@ PACKAGECONFIG_GLESV2 = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'glesv2', d)}" -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}" diff --git a/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend b/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend index 9343fb00ff..f9c23c94f7 100644 --- a/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend @@ -1,2 +1,2 @@ # userland driver EGL implementation does not have all needed bits for it so remove it from build -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend index cb9c24e4d4..28a66bcb33 100644 --- a/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend b/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend index 56ff4213aa..ebfc519f11 100644 --- a/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend @@ -1,3 +1,3 @@ # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend index 56ff4213aa..ebfc519f11 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend @@ -1,3 +1,3 @@ # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend index c187ab9c10..abb11ec8ff 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,2 +1,2 @@ # mesa-demos need libgles1 and userland driver does not have it -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend index e561a1b02f..edb75f59bc 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1,8 +1,8 @@ -PACKAGECONFIG_append_rpi = " gbm" -PROVIDES_append_rpi = " virtual/libgbm" +PACKAGECONFIG:append:rpi = " gbm" +PROVIDES:append:rpi = " virtual/libgbm" -GALLIUMDRIVERS_append_rpi = ",swrast" +GALLIUMDRIVERS:append:rpi = ",swrast" -do_install_append_rpi() { +do_install:append:rpi() { rm -rf ${D}${includedir}/KHR/khrplatform.h } diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend index eaa46f27b6..09c8db7a74 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend @@ -2,5 +2,5 @@ # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set # as default. To state out clearly that Raspi needs dri3 and to avoid surprises # in case oe-core changes this default, we set dri3 explicitly. -PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" -DRIDRIVERS_class-target_rpi = "" +PACKAGECONFIG:append:rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" +DRIDRIVERS:class-target:rpi = "" diff --git a/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend b/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend index 0503fd0c34..8dfce2727c 100644 --- a/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend @@ -1,5 +1,5 @@ # mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps -RDEPENDS_${PN}_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" +RDEPENDS:${PN}:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" # it needs EGL >= 11 but userland says it provided version 10, remove it from build # | -- Requested 'egl >= 11.0' but version of EGL is 10 -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb b/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb index 71590e370c..c81fb03f77 100644 --- a/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb +++ b/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=52962875ab02c36df6cde47b1f463024" COMPATIBLE_HOST = "null" -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" SRC_URI = "git://github.com/AndrewFromMelbourne/raspidmx;protocol=https \ file://0001-gitignore-add-archives-from-lib-directory.patch \ diff --git a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb index ead81f078f..a2ae918748 100644 --- a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb +++ b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb @@ -8,16 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" PROVIDES += "virtual/libomxil" -RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" +RPROVIDES:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "3fd8527eefd8790b4e8393458efc5f94eb21a615" +SRCREV = "97bc8180ad682b004ea224d1db7b8e108eda4397" # Use the date of the above commit as the package version. Update this when # SRCREV is changed. -PV = "20210319" +PV = "20210623" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ @@ -47,7 +47,7 @@ SRC_URI = "\ file://0024-userland-Sync-needed-defines-for-weston-build.patch \ " -SRC_URI_remove_toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch" +SRC_URI:remove:toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch" S = "${WORKDIR}/git" @@ -59,7 +59,7 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-a -DVMCS_INSTALL_PREFIX=${exec_prefix} \ " -EXTRA_OECMAKE_append_aarch64 = " -DARM64=ON " +EXTRA_OECMAKE:append:aarch64 = " -DARM64=ON " PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" @@ -67,9 +67,9 @@ 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" -do_install_append () { +do_install:append () { for f in `find ${D}${includedir}/interface/vcos/ -name "*.h"`; do sed -i 's/include "vcos_platform.h"/include "pthreads\/vcos_platform.h"/g' ${f} sed -i 's/include "vcos_futex_mutex.h"/include "pthreads\/vcos_futex_mutex.h"/g' ${f} @@ -88,21 +88,25 @@ do_install_append () { ln -sf brcmegl.pc ${D}${libdir}/pkgconfig/egl.pc ln -sf brcmvg.pc ${D}${libdir}/pkgconfig/vg.pc fi + # Currently man files are installed in /usr/man instead of /usr/share/man, see comments in: + # https://github.com/raspberrypi/userland/commit/45a0022ac64b4d0788def3c5230c972430f6fc23 + mkdir -pv ${D}${datadir} + mv -v ${D}${prefix}/man ${D}${mandir} } # Shared libs from userland package build aren't versioned, so we need # to force the .so files into the runtime package (and keep them # out of -dev package). FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/*.so \ ${libdir}/plugins" -FILES_${PN}-dev += "${includedir} \ +FILES:${PN}-dev += "${includedir} \ ${prefix}/src" -FILES_${PN}-doc += "${datadir}/install" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" +FILES:${PN}-doc += "${datadir}/install" +FILES:${PN}-dbg += "${libdir}/plugins/.debug" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" diff --git a/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc b/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc index 540e289548..e5e8f5358c 100644 --- a/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc +++ b/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc @@ -40,15 +40,15 @@ do_install () { } # These are proprietary binaries generated elsewhere so don't check ldflags -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" INITSCRIPT_NAME = "vchiq.sh" INITSCRIPT_PARAMS = "start 03 S ." -FILES_${PN} = "${bindir}/* \ +FILES:${PN} = "${bindir}/* \ ${libdir}/lib*.so \ ${sysconfdir}/init.d \ ${libdir}/plugins" -FILES_${PN}-dev = "${libdir}/pkgconfig \ +FILES:${PN}-dev = "${libdir}/pkgconfig \ ${includedir}" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" +FILES:${PN}-dbg += "${libdir}/plugins/.debug" diff --git a/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend b/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend index e5bbf4aaab..ca2b2961e4 100644 --- a/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend @@ -1,5 +1,5 @@ # until fully tested, prefer `libwayland-egl` provided by `userland` instead of `wayland` when not using vc4graphics -do_install_append_rpi () { +do_install:append:rpi () { if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "0" ]; then rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc diff --git a/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend b/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend index 55cf7007b0..89917f0498 100644 --- a/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" +PACKAGECONFIG:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" -EXTRA_OECONF_append_rpi = " \ +EXTRA_OECONF:append:rpi = " \ --disable-xwayland-test \ --disable-simple-egl-clients \ ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ diff --git a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend index 71e0adcd4f..da3cd8ac7c 100644 --- a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://xorg.conf.d/98-pitft.conf \ file://xorg.conf.d/99-calibration.conf \ " -do_install_append_rpi () { +do_install:append:rpi () { PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" if [ "${PITFT}" = "1" ]; then install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ @@ -13,4 +13,4 @@ do_install_append_rpi () { fi } -FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" +FILES:${PN}:rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" diff --git a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 9574fa5b8a..25829c26b0 100644 --- a/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,5 +1,5 @@ -OPENGL_PKGCONFIGS_rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" +OPENGL_PKGCONFIGS:rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" 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 d28e2c126c..ef8df32497 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 @@ -60,40 +60,40 @@ PACKAGES = "\ ${PN}-bcm4345c5-hcd \ " -LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-cypress-license = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-cypress-license = "Firmware-cypress-rpidistro" -FILES_${PN}-cypress-license = "\ +FILES:${PN}-cypress-license = "\ ${nonarch_base_libdir}/firmware/LICENCE.cypress-rpidistro \ " -FILES_${PN}-bcm43430a1-hcd = "\ +FILES:${PN}-bcm43430a1-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \ " -FILES_${PN}-bcm43430b0-hcd = "\ +FILES:${PN}-bcm43430b0-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \ " -FILES_${PN}-bcm4345c0-hcd = "\ +FILES:${PN}-bcm4345c0-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \ " -FILES_${PN}-bcm4345c5-hcd = "\ +FILES:${PN}-bcm4345c5-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM4345C5.hcd \ " -RDEPENDS_${PN}-bcm43430a1-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm43430b0-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm4345c0-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm4345c5-hcd += "${PN}-cypress-license" -RCONFLICTS_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" -RREPLACES_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" -RCONFLICTS_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" -RREPLACES_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" -RCONFLICTS_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" -RREPLACES_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" -RCONFLICTS_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" -RREPLACES_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" +RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm43430b0-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm4345c0-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm4345c5-hcd += "${PN}-cypress-license" +RCONFLICTS:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" +RREPLACES:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" +RCONFLICTS:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" +RREPLACES:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" +RCONFLICTS:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" +RREPLACES:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" +RCONFLICTS:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" +RREPLACES:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" # Firmware files are generally not run on the CPU, so they can be # allarch despite being architecture specific 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 a091585a55..37e2e57093 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 @@ -75,38 +75,38 @@ PACKAGES = "\ ${PN}-bcm43456 \ " -LICENSE_${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" -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/LICENCE.broadcom_bcm43xx-rpidistro" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*" -FILES_${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" -RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" -RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -RDEPENDS_${PN}-bcm43456 += "${PN}-broadcom-license" -RCONFLICTS_${PN}-bcm43430 = "\ +LICENSE:${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" +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/LICENCE.broadcom_bcm43xx-rpidistro" +FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*" +FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*" +FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" +RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43455 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43456 += "${PN}-broadcom-license" +RCONFLICTS:${PN}-bcm43430 = "\ linux-firmware-bcm43430 \ linux-firmware-raspbian-bcm43430 \ " -RREPLACES_${PN}-bcm43430 = "\ +RREPLACES:${PN}-bcm43430 = "\ linux-firmware-bcm43430 \ linux-firmware-raspbian-bcm43430 \ " -RCONFLICTS_${PN}-bcm43455 = "\ +RCONFLICTS:${PN}-bcm43455 = "\ linux-firmware-bcm43455 \ linux-firmware-raspbian-bcm43455 \ " -RREPLACES_${PN}-bcm43455 = "\ +RREPLACES:${PN}-bcm43455 = "\ linux-firmware-bcm43455 \ linux-firmware-raspbian-bcm43455 \ " -RCONFLICTS_${PN}-bcm43456 = "\ +RCONFLICTS:${PN}-bcm43456 = "\ linux-firmware-bcm43456 \ linux-firmware-raspbian-bcm43456 \ " -RREPLACES_${PN}-bcm43456 = "\ +RREPLACES:${PN}-bcm43456 = "\ linux-firmware-bcm43456 \ linux-firmware-raspbian-bcm43456 \ " diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index 683253cef7..ea47b5643b 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -18,14 +18,14 @@ SRC_URI += " \ " KCONFIG_MODE = "--alldefconfig" -KBUILD_DEFCONFIG_raspberrypi0-wifi ?= "bcmrpi_defconfig" -KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" -KBUILD_DEFCONFIG_raspberrypi-cm3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" -KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" -KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi0-wifi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG:raspberrypi-cm3 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig" +KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig" LINUX_VERSION_EXTENSION ?= "" 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 fc33559c39..da4e748384 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.31" +LINUX_VERSION ?= "5.10.52" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "89399e6e7e33d6260a954603ca03857df594ffd3" +SRCREV_machine = "6495fa3396fb387d3871ced42a30281fe7be5352" SRCREV_meta = "a19886b00ea7d874fdd60d8e3435894bb16e6434" KMETA = "kernel-meta" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index a971236f21..5e0b457872 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ file://0003-no-timeout-on-get-state.patch \ file://0004-Properly-handle-drain-requests-while-flushing.patch \ file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ " -GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" -GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" -EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" +GSTREAMER_1_0_OMX_TARGET:rpi = "rpi" +GSTREAMER_1_0_OMX_CORE_NAME:rpi = "${libdir}/libopenmaxil.so" +EXTRA_OEMESON:append:rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 8ab1510d8c..4a815abf2c 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rpi = " hls libmms \ +PACKAGECONFIG:append:rpi = " hls libmms \ ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'faad', '', d)}" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend index 6bed42a873..834ccfbbc4 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -1,6 +1,6 @@ # if using bcm driver enable dispmanx not when using VC4 driver -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}" -DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}" +DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" PACKAGECONFIG_GL_VC4GRAPHICS = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" -PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '${PACKAGECONFIG_GL_VC4GRAPHICS}', 'egl gles2', d)}" +PACKAGECONFIG_GL:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '${PACKAGECONFIG_GL_VC4GRAPHICS}', 'egl gles2', d)}" diff --git a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend index 80a324f0ca..f3fb1441d1 100644 --- a/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb index 55e5a1c8c9..d294399880 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -36,12 +36,12 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master file://0007-Remove-Makefile-hardcoded-arch-tune.patch \ " -SRC_URI_append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" +SRC_URI:append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^rpi$" -COMPATIBLE_HOST_aarch64 = "null" +COMPATIBLE_HOST:aarch64 = "null" def cpu(d): for arg in (d.getVar('TUNE_CCARGS') or '').split(): @@ -99,10 +99,10 @@ do_install() { install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/ } -FILES_${PN} = "${bindir}/omxplayer* \ +FILES:${PN} = "${bindir}/omxplayer* \ ${libdir}/omxplayer/lib*${SOLIBS} \ ${datadir}/fonts" -FILES_${PN}-dev += "${libdir}/omxplayer/*.so" +FILES:${PN}-dev += "${libdir}/omxplayer/*.so" -RDEPENDS_${PN} += "bash procps userland" +RDEPENDS:${PN} += "bash procps userland" diff --git a/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend b/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend index 505719efb8..e0cfaf8d92 100644 --- a/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend +++ b/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend @@ -1,2 +1,2 @@ -EXTRA_OECONF_append_raspberrypi = " --disable-asm" -EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm" +EXTRA_OECONF:append:raspberrypi = " --disable-asm" +EXTRA_OECONF:append:raspberrypi0-wifi = " --disable-asm" |