diff options
| author | Andrei Gherzan <andrei@gherzan.com> | 2021-08-03 14:43:18 +0100 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2021-08-03 14:44:07 +0100 |
| commit | 844827a3d265fbde0467c5687747662ceb49a938 (patch) | |
| tree | 545d37c830534b43da2533efd402d9068cc15148 /recipes-core | |
| parent | 8dc3a310883ea87cd9900442f46f20bb08e57583 (diff) | |
| download | meta-raspberrypi-ag/override.tar.gz | |
Convert to new override syntaxag/override
converting the metadata to use ":" as the override character instead of
"_".
Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/images/rpi-basic-image.bb | 2 | ||||
| -rw-r--r-- | recipes-core/images/rpi-hwup-image.bb | 2 | ||||
| -rw-r--r-- | recipes-core/images/rpi-test-image.bb | 2 | ||||
| -rw-r--r-- | recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend | 2 | ||||
| -rw-r--r-- | recipes-core/packagegroups/packagegroup-rpi-test.bb | 4 | ||||
| -rw-r--r-- | recipes-core/psplash/psplash_%.bbappend | 2 | ||||
| -rw-r--r-- | recipes-core/udev/udev-rules-udisks-rpi_1.0.bb | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/recipes-core/images/rpi-basic-image.bb b/recipes-core/images/rpi-basic-image.bb index 77a3d7b..1bbbb50 100644 --- a/recipes-core/images/rpi-basic-image.bb +++ b/recipes-core/images/rpi-basic-image.bb | |||
| @@ -10,6 +10,6 @@ SPLASH = "psplash-raspberrypi" | |||
| 10 | 10 | ||
| 11 | IMAGE_FEATURES += "ssh-server-dropbear splash" | 11 | IMAGE_FEATURES += "ssh-server-dropbear splash" |
| 12 | 12 | ||
| 13 | do_image_prepend() { | 13 | do_image:prepend() { |
| 14 | bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead") | 14 | bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead") |
| 15 | } | 15 | } |
diff --git a/recipes-core/images/rpi-hwup-image.bb b/recipes-core/images/rpi-hwup-image.bb index 86e9b6d..eacec0e 100644 --- a/recipes-core/images/rpi-hwup-image.bb +++ b/recipes-core/images/rpi-hwup-image.bb | |||
| @@ -6,6 +6,6 @@ IMAGE_INSTALL += " \ | |||
| 6 | kernel-modules \ | 6 | kernel-modules \ |
| 7 | " | 7 | " |
| 8 | 8 | ||
| 9 | do_image_prepend() { | 9 | do_image:prepend() { |
| 10 | bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead") | 10 | bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead") |
| 11 | } | 11 | } |
diff --git a/recipes-core/images/rpi-test-image.bb b/recipes-core/images/rpi-test-image.bb index c2f5f73..360b20d 100644 --- a/recipes-core/images/rpi-test-image.bb +++ b/recipes-core/images/rpi-test-image.bb | |||
| @@ -3,4 +3,4 @@ include recipes-core/images/core-image-base.bb | |||
| 3 | 3 | ||
| 4 | COMPATIBLE_MACHINE = "^rpi$" | 4 | COMPATIBLE_MACHINE = "^rpi$" |
| 5 | 5 | ||
| 6 | IMAGE_INSTALL_append = " packagegroup-rpi-test" | 6 | IMAGE_INSTALL:append = " packagegroup-rpi-test" |
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend index 500d871..1cc1dfc 100644 --- a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend +++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | # mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver | 1 | # mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver |
| 2 | X11GLTOOLS_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" | 2 | X11GLTOOLS:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" |
diff --git a/recipes-core/packagegroups/packagegroup-rpi-test.bb b/recipes-core/packagegroups/packagegroup-rpi-test.bb index a3f4ac9..265dfc5 100644 --- a/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/recipes-core/packagegroups/packagegroup-rpi-test.bb | |||
| @@ -10,7 +10,7 @@ COMPATIBLE_MACHINE = "^rpi$" | |||
| 10 | 10 | ||
| 11 | OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}" | 11 | OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}" |
| 12 | 12 | ||
| 13 | RDEPENDS_${PN} = "\ | 13 | RDEPENDS:${PN} = "\ |
| 14 | ${OMXPLAYER} \ | 14 | ${OMXPLAYER} \ |
| 15 | bcm2835-tests \ | 15 | bcm2835-tests \ |
| 16 | rpio \ | 16 | rpio \ |
| @@ -23,7 +23,7 @@ RDEPENDS_${PN} = "\ | |||
| 23 | bluez5 \ | 23 | bluez5 \ |
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | RRECOMMENDS_${PN} = "\ | 26 | RRECOMMENDS:${PN} = "\ |
| 27 | ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \ | 27 | ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \ |
| 28 | ${MACHINE_EXTRA_RRECOMMENDS} \ | 28 | ${MACHINE_EXTRA_RRECOMMENDS} \ |
| 29 | " | 29 | " |
diff --git a/recipes-core/psplash/psplash_%.bbappend b/recipes-core/psplash/psplash_%.bbappend index 41622aa..a2de78b 100644 --- a/recipes-core/psplash/psplash_%.bbappend +++ b/recipes-core/psplash/psplash_%.bbappend | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
| 2 | SPLASH_IMAGES_rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" | 2 | SPLASH_IMAGES_rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" |
diff --git a/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb b/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb index ae35521..d5d4589 100644 --- a/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb +++ b/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb | |||
| @@ -10,4 +10,4 @@ do_install () { | |||
| 10 | install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d | 10 | install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | FILES_${PN} = "${base_libdir}/udev/rules.d" | 13 | FILES:${PN} = "${base_libdir}/udev/rules.d" |
