MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-05 05:04:45 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Convert to new override syntax

Browse Source 
This is the result of automated script conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2021-07-29 19:58:04 +02:00 committed by Andrei Gherzan
parent 8dc3a31088
commit 9ea7aa2cd2
64 changed files with 196 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/sdcard_image-rpi.bbclass
View File

@ -23,12 +23,12 @@ inherit image_types
# 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS # 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS
# This image depends on the rootfs image # This image depends on the rootfs image
IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
# Kernel image name # Kernel image name
SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img" SDIMG_KERNELIMAGE:raspberrypi ?= "kernel.img"
SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img"
SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img"
# Boot partition volume id # Boot partition volume id
# Shorten raspberrypi to just rpi to keep it under 11 characters # Shorten raspberrypi to just rpi to keep it under 11 characters
@ -50,7 +50,7 @@ inherit kernel-artifact-names
RPI_SDIMG_EXTRA_DEPENDS ?= "" RPI_SDIMG_EXTRA_DEPENDS ?= ""
do_image_rpi_sdimg[depends] = " \ do_image:rpi_sdimg[depends] = " \
parted-native:do_populate_sysroot \ parted-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \
dosfstools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \
@ -62,7 +62,7 @@ do_image_rpi_sdimg[depends] = " \
${RPI_SDIMG_EXTRA_DEPENDS} \ ${RPI_SDIMG_EXTRA_DEPENDS} \
" "
do_image_rpi_sdimg[recrdeps] = "do_build" do_image:rpi_sdimg[recrdeps] = "do_build"
# SD card image name # SD card image name
SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg" SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg"
@ -87,7 +87,7 @@ def split_overlays(d, out, ver=None):
return overlays return overlays
IMAGE_CMD_rpi-sdimg () { IMAGE_CMD:rpi-sdimg () {
# Align partitions # Align partitions
BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)

12
conf/layer.conf
View File

@ -6,11 +6,11 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
${LAYERDIR}/recipes*/*/*.bbappend" ${LAYERDIR}/recipes*/*/*.bbappend"
BBFILE_COLLECTIONS += "raspberrypi" BBFILE_COLLECTIONS += "raspberrypi"
BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PATTERN:raspberrypi := "^${LAYERDIR}/"
BBFILE_PRIORITY_raspberrypi = "9" BBFILE_PRIORITY:raspberrypi = "9"
LAYERSERIES_COMPAT_raspberrypi = "hardknott honister" LAYERSERIES_COMPAT:raspberrypi = "hardknott honister"
LAYERDEPENDS_raspberrypi = "core" LAYERDEPENDS:raspberrypi = "core"
# Additional license directories. # Additional license directories.
LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
@ -36,5 +36,5 @@ BBFILES_DYNAMIC += " \
multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
" "
DEFAULT_TEST_SUITES_remove_rpi = "parselogs" DEFAULT_TEST_SUITES:remove:rpi = "parselogs"
DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi"

2
conf/machine/include/rpi-base.inc
View File

@ -144,4 +144,4 @@ do_image_wic[recrdeps] = "do_build"
# The kernel image is installed into the FAT32 boot partition and does not need # The kernel image is installed into the FAT32 boot partition and does not need
# to also be installed into the rootfs. # to also be installed into the rootfs.
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""

6
conf/machine/include/rpi-default-settings.inc
View File

@ -3,7 +3,7 @@
IMAGE_CLASSES += "sdcard_image-rpi" IMAGE_CLASSES += "sdcard_image-rpi"
# RPI kernel has errors of its own which should be filtered # RPI kernel has errors of its own which should be filtered
# therefore use parselogs_rpi test instead of parselogs from oe-core # therefore use parselogs:rpi test instead of parselogs from oe-core
# #
DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi"
DEFAULT_TEST_SUITES_remove_rpi = " parselogs" DEFAULT_TEST_SUITES:remove:rpi = " parselogs"

12
conf/machine/include/tune-arm1176jzf-s.inc
View File

@ -7,11 +7,11 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', ' -mcpu=arm
MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}"
AVAILTUNES += "arm1176jzfs" AVAILTUNES += "arm1176jzfs"
ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" ARMPKGARCH:tune-arm1176jzfs = "arm1176jzfs"
TUNE_FEATURES_tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" TUNE_FEATURES:tune-arm1176jzfs = "arm thumb vfp arm1176jzfs"
PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1176jzfs" PACKAGE_EXTRA_ARCHS:tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1176jzfs"
AVAILTUNES += "arm1176jzfshf" AVAILTUNES += "arm1176jzfshf"
ARMPKGARCH_tune-arm1176jzfshf = "${ARMPKGARCH_tune-arm1176jzfs}" ARMPKGARCH:tune-arm1176jzfshf = "${ARMPKGARCH:tune-arm1176jzfs}"
TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" TUNE_FEATURES:tune-arm1176jzfshf = "${TUNE_FEATURES:tune-arm1176jzfs} callconvention-hard"
PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} arm1176jzfshf-vfp" PACKAGE_EXTRA_ARCHS:tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} arm1176jzfshf-vfp"

2
conf/machine/raspberrypi3-64.conf
View File

@ -23,7 +23,7 @@ RPI_KERNEL_DEVICETREE = " \
SERIAL_CONSOLES ?= "115200;ttyS0" SERIAL_CONSOLES ?= "115200;ttyS0"
UBOOT_MACHINE = "rpi_arm64_config" UBOOT_MACHINE = "rpi:arm64_config"
# When u-boot is enabled we need to use the "Image" format and the "booti" # When u-boot is enabled we need to use the "Image" format and the "booti"
# command to load the kernel # command to load the kernel

2
conf/machine/raspberrypi4-64.conf
View File

@ -22,7 +22,7 @@ RPI_KERNEL_DEVICETREE = " \
SDIMG_KERNELIMAGE ?= "kernel8.img" SDIMG_KERNELIMAGE ?= "kernel8.img"
SERIAL_CONSOLES ?= "115200;ttyS0" SERIAL_CONSOLES ?= "115200;ttyS0"
UBOOT_MACHINE = "rpi_arm64_config" UBOOT_MACHINE = "rpi:arm64_config"
VC4DTBO ?= "vc4-fkms-v3d" VC4DTBO ?= "vc4-fkms-v3d"

4
docs/conf.py
View File

@ -284,7 +284,7 @@ latex_documents = [
# Documents to append as an appendix to all manuals. # Documents to append as an appendix to all manuals.
# #
# latex_appendices = [] # latex:appendices = []
# It false, will not define \strong, \code, itleref, \crossref ... but only # It false, will not define \strong, \code, itleref, \crossref ... but only
# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added # \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
@ -324,7 +324,7 @@ texinfo_documents = [
# Documents to append as an appendix to all manuals. # Documents to append as an appendix to all manuals.
# #
# texinfo_appendices = [] # texinfo:appendices = []
# If false, no module index is generated. # If false, no module index is generated.
# #

6
docs/extra-build-config.md
View File

@ -159,7 +159,7 @@ command (eg. bootz) to be used.
To build an initramfs image: 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 BLK_DEV_INITRD y
- kernel_configure_variable INITRAMFS_SOURCE "" - 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 files are available when they are needed, so these component deploy
tasks must be added to: RPI_SDIMG_EXTRA_DEPENDS. 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 ## 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: 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 ## Enable PiTFT support

4
dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend
View File

@ -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://lirc-gpio-ir-0.10.patch \
file://lircd.service \ file://lircd.service \
" "

4
dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
RDEPENDS_${PN} += "python3-sense-hat" RDEPENDS:${PN} += "python3-sense-hat"

2
dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb
View File

@ -17,7 +17,7 @@ DEPENDS += " \
freetype \ freetype \
" "
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
${PYTHON_PN}-numpy \ ${PYTHON_PN}-numpy \
${PYTHON_PN}-rtimu \ ${PYTHON_PN}-rtimu \
${PYTHON_PN}-pillow \ ${PYTHON_PN}-pillow \

2
dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend
View File

@ -1,2 +1,2 @@
PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi" PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi"
PACKAGECONFIG_append_rpi = " raspberrypi" PACKAGECONFIG:append:rpi = " raspberrypi"

4
dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend
View File

@ -1,3 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
COMPATIBLE_MACHINE_rpi = "(null)" COMPATIBLE_MACHINE:rpi = "(null)"

2
dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
View File

@ -1 +1 @@
RDEPENDS_packagegroup-meta-oe-kernel_remove_rpi = "bpftool" RDEPENDS:packagegroup-meta-oe-kernel:remove:rpi = "bpftool"

20
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
View File

@ -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', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \
'', d), d)}" '', d), d)}"
PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" PACKAGECONFIG_GL:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}"
PACKAGECONFIG_GL_append_rpi = " gbm" PACKAGECONFIG_GL:append:rpi = " gbm"
PACKAGECONFIG_FONTS_rpi = "fontconfig" PACKAGECONFIG_FONTS:rpi = "fontconfig"
PACKAGECONFIG_append_rpi = " libinput examples tslib xkbcommon" PACKAGECONFIG:append:rpi = " libinput examples tslib xkbcommon"
PACKAGECONFIG_remove_rpi = "tests" 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 # Add the appropriate EGLFS_DEVICE_INTEGRATION
if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then
echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri
fi fi
} }
RDEPENDS_${PN}_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)}" DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}"

2
recipes-bsp/bootfiles/rpi-config_git.bb
View File

@ -261,7 +261,7 @@ do_deploy() {
fi fi
} }
do_deploy_append_raspberrypi3-64() { do_deploy:append:raspberrypi3-64() {
echo "# have a properly sized image" >> $CONFIG echo "# have a properly sized image" >> $CONFIG
echo "disable_overscan=1" >> $CONFIG echo "disable_overscan=1" >> $CONFIG

2
recipes-bsp/formfactor/formfactor_%.bbappend
View File

@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

10
recipes-bsp/u-boot/u-boot_%.bbappend
View File

@ -1,15 +1,15 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI_append_rpi = " \ SRC_URI:append:rpi = " \
file://fw_env.config \ file://fw_env.config \
" "
# special fix for raspberrypi-cm3 # 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 -d ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
} }

6
recipes-connectivity/bluez5/bluez5_%.bbappend
View File

@ -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://0001-bcm43xx-Add-bcm43xx-3wire-variant.patch \
file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \ file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \
file://0003-Increase-firmware-load-timeout-to-30s.patch \ file://0003-Increase-firmware-load-timeout-to-30s.patch \
file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \ file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \
" "
RDEPENDS_${PN}_append_rpi = " pi-bluetooth" RDEPENDS:${PN}:append:rpi = " pi-bluetooth"

6
recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb
View File

@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
# hciuart.service replaces what was brcm43438.service # hciuart.service replaces what was brcm43438.service
inherit systemd inherit systemd
SYSTEMD_SERVICE_${PN} = "\ SYSTEMD_SERVICE:${PN} = "\
hciuart.service \ hciuart.service \
bthelper@.service \ bthelper@.service \
" "
@ -36,12 +36,12 @@ do_install() {
fi fi
} }
FILES_${PN} = "\ FILES:${PN} = "\
${bindir} \ ${bindir} \
${sysconfdir} \ ${sysconfdir} \
${systemd_unitdir}/system \ ${systemd_unitdir}/system \
" "
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
udev-rules-rpi \ udev-rules-rpi \
" "

2
recipes-core/images/rpi-basic-image.bb
View File

@ -10,6 +10,6 @@ SPLASH = "psplash-raspberrypi"
IMAGE_FEATURES += "ssh-server-dropbear splash" 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") bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead")
} }

2
recipes-core/images/rpi-hwup-image.bb
View File

@ -6,6 +6,6 @@ IMAGE_INSTALL += " \
kernel-modules \ kernel-modules \
" "
do_image_prepend() { do_image:prepend() {
bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead") bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead")
} }

2
recipes-core/images/rpi-test-image.bb
View File

@ -3,4 +3,4 @@ include recipes-core/images/core-image-base.bb
COMPATIBLE_MACHINE = "^rpi$" COMPATIBLE_MACHINE = "^rpi$"
IMAGE_INSTALL_append = " packagegroup-rpi-test" IMAGE_INSTALL:append = " packagegroup-rpi-test"

2
recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
View File

@ -1,2 +1,2 @@
# mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver # 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)}"

4
recipes-core/packagegroups/packagegroup-rpi-test.bb
View File

@ -10,7 +10,7 @@ COMPATIBLE_MACHINE = "^rpi$"
OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}" OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}"
RDEPENDS_${PN} = "\ RDEPENDS:${PN} = "\
${OMXPLAYER} \ ${OMXPLAYER} \
bcm2835-tests \ bcm2835-tests \
rpio \ rpio \
@ -23,7 +23,7 @@ RDEPENDS_${PN} = "\
bluez5 \ bluez5 \
" "
RRECOMMENDS_${PN} = "\ RRECOMMENDS:${PN} = "\
${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \
${MACHINE_EXTRA_RRECOMMENDS} \ ${MACHINE_EXTRA_RRECOMMENDS} \
" "

4
recipes-core/psplash/psplash_%.bbappend
View File

@ -1,2 +1,2 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SPLASH_IMAGES_rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" SPLASH_IMAGES:rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"

2
recipes-core/udev/udev-rules-udisks-rpi_1.0.bb
View File

@ -10,4 +10,4 @@ do_install () {
install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d 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"

12
recipes-devtools/bcm2835/bcm2835_1.52.bb
View File

@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "b9fd10f7a80aadaed28a77168709b7c519568a63b6e98d0a50e9c5fe31
inherit autotools inherit autotools
do_compile_append() { do_compile:append() {
# Now compiling the examples provided by the package # Now compiling the examples provided by the package
mkdir -p ${B}/examples mkdir -p ${B}/examples
for file in `ls ${S}/examples`; do for file in `ls ${S}/examples`; do
@ -25,7 +25,7 @@ do_compile_append() {
done done
} }
do_install_append() { do_install:append() {
install -d ${D}/${libdir}/${BPN} install -d ${D}/${libdir}/${BPN}
for file in ${B}/examples/* for file in ${B}/examples/*
do do
@ -35,8 +35,8 @@ do_install_append() {
PACKAGES += "${PN}-tests" PACKAGES += "${PN}-tests"
RDEPENDS_${PN}-dev = "" RDEPENDS:${PN}-dev = ""
FILES_${PN} = "" FILES:${PN} = ""
FILES_${PN}-tests = "${libdir}/${BPN}" FILES:${PN}-tests = "${libdir}/${BPN}"
FILES_${PN}-dbg += "${libdir}/${BPN}/.debug" FILES:${PN}-dbg += "${libdir}/${BPN}/.debug"

4
recipes-devtools/pi-blaster/pi-blaster_git.bb
View File

@ -15,8 +15,8 @@ SRCREV = "befd8ef36e5066e4d444ef47fe4020787e541248"
inherit update-rc.d autotools inherit update-rc.d autotools
INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_PACKAGES = "${PN}"
INITSCRIPT_NAME_${PN} = "${PN}.boot.sh" INITSCRIPT_NAME:${PN} = "${PN}.boot.sh"
INITSCRIPT_PARAMS_${PN} = "defaults 15 85" INITSCRIPT_PARAMS:${PN} = "defaults 15 85"
COMPATIBLE_MACHINE = "^rpi$" COMPATIBLE_MACHINE = "^rpi$"

6
recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb
View File

@ -12,7 +12,7 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
do_install_append() { do_install:append() {
# it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt # 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 # 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 if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then
@ -20,11 +20,11 @@ do_install_append() {
fi fi
} }
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
libgpiod \ libgpiod \
python3-adafruit-platformdetect \ python3-adafruit-platformdetect \
python3-adafruit-pureio \ python3-adafruit-pureio \
python3-core \ python3-core \
" "
RDEPENDS_${PN}_append_rpi = " rpi-gpio" RDEPENDS:${PN}:append:rpi = " rpi-gpio"

2
recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb
View File

@ -12,7 +12,7 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
python3-adafruit-blinka \ python3-adafruit-blinka \
python3-core \ python3-core \
" "

2
recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb
View File

@ -12,7 +12,7 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
python3-adafruit-blinka \ python3-adafruit-blinka \
python3-core \ python3-core \
" "

2
recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb
View File

@ -12,7 +12,7 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
python3-adafruit-blinka \ python3-adafruit-blinka \
python3-adafruit-circuitpython-busdevice \ python3-adafruit-circuitpython-busdevice \
python3-adafruit-circuitpython-motor \ python3-adafruit-circuitpython-motor \

2
recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb
View File

@ -12,7 +12,7 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
python3-adafruit-blinka \ python3-adafruit-blinka \
python3-adafruit-circuitpython-busdevice \ python3-adafruit-circuitpython-busdevice \
python3-adafruit-circuitpython-register \ python3-adafruit-circuitpython-register \

2
recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb
View File

@ -12,4 +12,4 @@ DEPENDS += "python3-setuptools-scm-native"
inherit setuptools3 inherit setuptools3
RDEPENDS_${PN} += "python3-core" RDEPENDS:${PN} += "python3-core"

2
recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb
View File

@ -12,4 +12,4 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += "python3-core" RDEPENDS:${PN} += "python3-core"

2
recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb
View File

@ -12,7 +12,7 @@ inherit setuptools3
DEPENDS += "python3-setuptools-scm-native" DEPENDS += "python3-setuptools-scm-native"
RDEPENDS_${PN} += " \ RDEPENDS:${PN} += " \
python3-core \ python3-core \
python3-ctypes \ python3-ctypes \
python3-fcntl \ python3-fcntl \

2
recipes-devtools/python/rpio_0.10.0.bb
View File

@ -14,7 +14,7 @@ inherit setuptools3
COMPATIBLE_MACHINE = "^rpi$" COMPATIBLE_MACHINE = "^rpi$"
RDEPENDS_${PN} = "\ RDEPENDS:${PN} = "\
python3-logging \ python3-logging \
python3-threading \ python3-threading \
" "

2
recipes-graphics/cairo/cairo_%.bbappend
View File

@ -1,3 +1,3 @@
PACKAGECONFIG_GLESV2 = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'glesv2', d)}" 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)}"

2
recipes-graphics/kmscube/kmscube_%.bbappend
View File

@ -1,2 +1,2 @@
# userland driver EGL implementation does not have all needed bits for it so remove it from build # 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)}"

4
recipes-graphics/libsdl2/libsdl2_%.bbappend
View File

@ -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 # 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 # 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)}"

2
recipes-graphics/libva/libva_%.bbappend
View File

@ -1,3 +1,3 @@
# when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # 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 # 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)}"

2
recipes-graphics/mesa/libglu_%.bbappend
View File

@ -1,3 +1,3 @@
# when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # 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 # 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)}"

2
recipes-graphics/mesa/mesa-demos_%.bbappend
View File

@ -1,2 +1,2 @@
# mesa-demos need libgles1 and userland driver does not have it # 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)}"

8
recipes-graphics/mesa/mesa-gl_%.bbappend
View File

@ -1,8 +1,8 @@
PACKAGECONFIG_append_rpi = " gbm" PACKAGECONFIG:append:rpi = " gbm"
PROVIDES_append_rpi = " virtual/libgbm" 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 rm -rf ${D}${includedir}/KHR/khrplatform.h
} }

4
recipes-graphics/mesa/mesa_%.bbappend
View File

@ -2,5 +2,5 @@
# With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set
# as default. To state out clearly that Raspi needs dri3 and to avoid surprises # 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. # 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)}" PACKAGECONFIG:append:rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}"
DRIDRIVERS_class-target_rpi = "" DRIDRIVERS:class-target:rpi = ""

4
recipes-graphics/piglit/piglit_%.bbappend
View File

@ -1,5 +1,5 @@
# mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps # 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 # 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 # | -- 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)}"

2
recipes-graphics/raspidmx/raspidmx_git.bb
View File

@ -5,7 +5,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=52962875ab02c36df6cde47b1f463024" LIC_FILES_CHKSUM = "file://LICENSE;md5=52962875ab02c36df6cde47b1f463024"
COMPATIBLE_HOST = "null" 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 \ SRC_URI = "git://github.com/AndrewFromMelbourne/raspidmx;protocol=https \
file://0001-gitignore-add-archives-from-lib-directory.patch \ file://0001-gitignore-add-archives-from-lib-directory.patch \

26
recipes-graphics/userland/userland_git.bb
View File

@ -1,14 +1,14 @@
DESCRIPTION = "This repository contains the source code for the ARM side \ DESCRIPTION = "This repository contains the source code for the ARM side \
libraries used on Raspberry Pi. These typically are installed in /opt/vc/lib \ libraries used on Raspberry Pi. These typically are installed in /opt/vc/lib \
and includes source for the ARM side code to interface to: EGL, mmal, GLESv2,\ and includes source for the ARM side code to interface to: EGL, mmal, GLESv2,\
vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG." vcos, openmaxil, vchiq:arm, bcm_host, WFC, OpenVG."
LICENSE = "BSD-3-Clause" LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196"
PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}"
PROVIDES += "virtual/libomxil" 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$" COMPATIBLE_MACHINE = "^rpi$"
SRCBRANCH = "master" SRCBRANCH = "master"
@ -47,7 +47,7 @@ SRC_URI = "\
file://0024-userland-Sync-needed-defines-for-weston-build.patch \ 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" 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} \ -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)}" 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[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland"
PACKAGECONFIG[allapps] = "-DALL_APPS=true,,," 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 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_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} sed -i 's/include "vcos_futex_mutex.h"/include "pthreads\/vcos_futex_mutex.h"/g' ${f}
@ -94,15 +94,15 @@ do_install_append () {
# to force the .so files into the runtime package (and keep them # to force the .so files into the runtime package (and keep them
# out of -dev package). # out of -dev package).
FILES_SOLIBSDEV = "" FILES_SOLIBSDEV = ""
INSANE_SKIP_${PN} += "dev-so" INSANE_SKIP:${PN} += "dev-so"
FILES_${PN} += " \ FILES:${PN} += " \
${libdir}/*.so \ ${libdir}/*.so \
${libdir}/plugins" ${libdir}/plugins"
FILES_${PN}-dev += "${includedir} \ FILES:${PN}-dev += "${includedir} \
${prefix}/src" ${prefix}/src"
FILES_${PN}-doc += "${datadir}/install" FILES:${PN}-doc += "${datadir}/install"
FILES_${PN}-dbg += "${libdir}/plugins/.debug" FILES:${PN}-dbg += "${libdir}/plugins/.debug"
RDEPENDS_${PN} += "bash" RDEPENDS:${PN} += "bash"
RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" RDEPENDS:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}"

8
recipes-graphics/vc-graphics/vc-graphics.inc
View File

@ -40,15 +40,15 @@ do_install () {
} }
# These are proprietary binaries generated elsewhere so don't check ldflags # These are proprietary binaries generated elsewhere so don't check ldflags
INSANE_SKIP_${PN} = "ldflags" INSANE_SKIP:${PN} = "ldflags"
INITSCRIPT_NAME = "vchiq.sh" INITSCRIPT_NAME = "vchiq.sh"
INITSCRIPT_PARAMS = "start 03 S ." INITSCRIPT_PARAMS = "start 03 S ."
FILES_${PN} = "${bindir}/* \ FILES:${PN} = "${bindir}/* \
${libdir}/lib*.so \ ${libdir}/lib*.so \
${sysconfdir}/init.d \ ${sysconfdir}/init.d \
${libdir}/plugins" ${libdir}/plugins"
FILES_${PN}-dev = "${libdir}/pkgconfig \ FILES:${PN}-dev = "${libdir}/pkgconfig \
${includedir}" ${includedir}"
FILES_${PN}-dbg += "${libdir}/plugins/.debug" FILES:${PN}-dbg += "${libdir}/plugins/.debug"

2
recipes-graphics/wayland/wayland_%.bbappend
View File

@ -1,5 +1,5 @@
# until fully tested, prefer `libwayland-egl` provided by `userland` instead of `wayland` when not using vc4graphics # 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 if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "0" ]; then
rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/libwayland-egl*
rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

4
recipes-graphics/wayland/weston_%.bbappend
View File

@ -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-xwayland-test \
--disable-simple-egl-clients \ --disable-simple-egl-clients \
${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \

8
recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
View File

@ -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/98-pitft.conf \
file://xorg.conf.d/99-calibration.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)}" PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
if [ "${PITFT}" = "1" ]; then if [ "${PITFT}" = "1" ]; then
install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
@ -13,4 +13,4 @@ do_install_append_rpi () {
fi 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/*"

4
recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
View File

@ -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 # 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 # 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)}"

44
recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb
View File

@ -60,40 +60,40 @@ PACKAGES = "\
${PN}-bcm4345c5-hcd \ ${PN}-bcm4345c5-hcd \
" "
LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro"
LICENSE_${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" LICENSE:${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro"
LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" LICENSE:${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro"
LICENSE_${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" LICENSE:${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro"
LICENSE_${PN}-cypress-license = "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 \ ${nonarch_base_libdir}/firmware/LICENCE.cypress-rpidistro \
" "
FILES_${PN}-bcm43430a1-hcd = "\ FILES:${PN}-bcm43430a1-hcd = "\
${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \ ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \
" "
FILES_${PN}-bcm43430b0-hcd = "\ FILES:${PN}-bcm43430b0-hcd = "\
${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \ ${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \
" "
FILES_${PN}-bcm4345c0-hcd = "\ FILES:${PN}-bcm4345c0-hcd = "\
${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \ ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \
" "
FILES_${PN}-bcm4345c5-hcd = "\ FILES:${PN}-bcm4345c5-hcd = "\
${nonarch_base_libdir}/firmware/brcm/BCM4345C5.hcd \ ${nonarch_base_libdir}/firmware/brcm/BCM4345C5.hcd \
" "
RDEPENDS_${PN}-bcm43430a1-hcd += "${PN}-cypress-license" RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license"
RDEPENDS_${PN}-bcm43430b0-hcd += "${PN}-cypress-license" RDEPENDS:${PN}-bcm43430b0-hcd += "${PN}-cypress-license"
RDEPENDS_${PN}-bcm4345c0-hcd += "${PN}-cypress-license" RDEPENDS:${PN}-bcm4345c0-hcd += "${PN}-cypress-license"
RDEPENDS_${PN}-bcm4345c5-hcd += "${PN}-cypress-license" RDEPENDS:${PN}-bcm4345c5-hcd += "${PN}-cypress-license"
RCONFLICTS_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" RCONFLICTS:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd"
RREPLACES_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" RREPLACES:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd"
RCONFLICTS_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" RCONFLICTS:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd"
RREPLACES_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" RREPLACES:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd"
RCONFLICTS_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" RCONFLICTS:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd"
RREPLACES_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" RREPLACES:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd"
RCONFLICTS_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" RCONFLICTS:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd"
RREPLACES_${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 # Firmware files are generally not run on the CPU, so they can be
# allarch despite being architecture specific # allarch despite being architecture specific

34
recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb
View File

@ -75,38 +75,38 @@ PACKAGES = "\
${PN}-bcm43456 \ ${PN}-bcm43456 \
" "
LICENSE_${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro"
LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro"
LICENSE_${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" LICENSE:${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro"
LICENSE_${PN}-broadcom-license = "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}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro"
FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*" FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*"
FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*" FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*"
FILES_${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*"
RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license"
RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" RDEPENDS:${PN}-bcm43455 += "${PN}-broadcom-license"
RDEPENDS_${PN}-bcm43456 += "${PN}-broadcom-license" RDEPENDS:${PN}-bcm43456 += "${PN}-broadcom-license"
RCONFLICTS_${PN}-bcm43430 = "\ RCONFLICTS:${PN}-bcm43430 = "\
linux-firmware-bcm43430 \ linux-firmware-bcm43430 \
linux-firmware-raspbian-bcm43430 \ linux-firmware-raspbian-bcm43430 \
" "
RREPLACES_${PN}-bcm43430 = "\ RREPLACES:${PN}-bcm43430 = "\
linux-firmware-bcm43430 \ linux-firmware-bcm43430 \
linux-firmware-raspbian-bcm43430 \ linux-firmware-raspbian-bcm43430 \
" "
RCONFLICTS_${PN}-bcm43455 = "\ RCONFLICTS:${PN}-bcm43455 = "\
linux-firmware-bcm43455 \ linux-firmware-bcm43455 \
linux-firmware-raspbian-bcm43455 \ linux-firmware-raspbian-bcm43455 \
" "
RREPLACES_${PN}-bcm43455 = "\ RREPLACES:${PN}-bcm43455 = "\
linux-firmware-bcm43455 \ linux-firmware-bcm43455 \
linux-firmware-raspbian-bcm43455 \ linux-firmware-raspbian-bcm43455 \
" "
RCONFLICTS_${PN}-bcm43456 = "\ RCONFLICTS:${PN}-bcm43456 = "\
linux-firmware-bcm43456 \ linux-firmware-bcm43456 \
linux-firmware-raspbian-bcm43456 \ linux-firmware-raspbian-bcm43456 \
" "
RREPLACES_${PN}-bcm43456 = "\ RREPLACES:${PN}-bcm43456 = "\
linux-firmware-bcm43456 \ linux-firmware-bcm43456 \
linux-firmware-raspbian-bcm43456 \ linux-firmware-raspbian-bcm43456 \
" "

16
recipes-kernel/linux/linux-raspberrypi.inc
View File

@ -18,14 +18,14 @@ SRC_URI += " \
" "
KCONFIG_MODE = "--alldefconfig" KCONFIG_MODE = "--alldefconfig"
KBUILD_DEFCONFIG_raspberrypi0-wifi ?= "bcmrpi_defconfig" KBUILD_DEFCONFIG:raspberrypi0-wifi ?= "bcmrpi_defconfig"
KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig"
KBUILD_DEFCONFIG_raspberrypi-cm3 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG:raspberrypi-cm3 ?= "bcm2709_defconfig"
KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig"
KBUILD_DEFCONFIG_raspberrypi3 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig"
KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig"
KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig"
KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig"
LINUX_VERSION_EXTENSION ?= "" LINUX_VERSION_EXTENSION ?= ""

10
recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
View File

@ -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://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
file://0003-no-timeout-on-get-state.patch \ file://0003-no-timeout-on-get-state.patch \
file://0004-Properly-handle-drain-requests-while-flushing.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 \ 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_TARGET:rpi = "rpi"
GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" GSTREAMER_1_0_OMX_CORE_NAME:rpi = "${libdir}/libopenmaxil.so"
EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" EXTRA_OEMESON:append:rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL"

2
recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
View File

@ -1,2 +1,2 @@
PACKAGECONFIG_append_rpi = " hls libmms \ PACKAGECONFIG:append:rpi = " hls libmms \
${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'faad', '', d)}" ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'faad', '', d)}"

6
recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
View File

@ -1,6 +1,6 @@
# if using bcm driver enable dispmanx not when using VC4 driver # if using bcm driver enable dispmanx not when using VC4 driver
PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}" PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}"
DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', 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_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)}"

2
recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend
View File

@ -1 +1 @@
PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}"

10
recipes-multimedia/omxplayer/omxplayer_git.bb
View File

@ -36,12 +36,12 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
file://0007-Remove-Makefile-hardcoded-arch-tune.patch \ 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" S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "^rpi$" COMPATIBLE_MACHINE = "^rpi$"
COMPATIBLE_HOST_aarch64 = "null" COMPATIBLE_HOST:aarch64 = "null"
def cpu(d): def cpu(d):
for arg in (d.getVar('TUNE_CCARGS') or '').split(): for arg in (d.getVar('TUNE_CCARGS') or '').split():
@ -99,10 +99,10 @@ do_install() {
install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/ install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/
} }
FILES_${PN} = "${bindir}/omxplayer* \ FILES:${PN} = "${bindir}/omxplayer* \
${libdir}/omxplayer/lib*${SOLIBS} \ ${libdir}/omxplayer/lib*${SOLIBS} \
${datadir}/fonts" ${datadir}/fonts"
FILES_${PN}-dev += "${libdir}/omxplayer/*.so" FILES:${PN}-dev += "${libdir}/omxplayer/*.so"
RDEPENDS_${PN} += "bash procps userland" RDEPENDS:${PN} += "bash procps userland"

4
recipes-multimedia/x264/x264_%.bbappend
View File

@ -1,2 +1,2 @@
EXTRA_OECONF_append_raspberrypi = " --disable-asm" EXTRA_OECONF:append:raspberrypi = " --disable-asm"
EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm" EXTRA_OECONF:append:raspberrypi0-wifi = " --disable-asm"