From ff02bf92e66a9997576923b4622cdcf740352724 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Jul 2017 12:49:59 +0200 Subject: [PATCH] packagegroup-rpi-test, rpi-test-image: restrict to ^rpi$ and include omxplayer only for 32bit rpi * omxplayer has: COMPATIBLE_MACHINE_rpi_aarch64 = null so it cannot be inclued for raspberrypi3-64 * components used by this packagegroup are also restricted to ^rpi$ so the packagegroup and the image using it cannot be built for anything else * fixes couple errors when trying to build world with meta-raspberrypi included Signed-off-by: Martin Jansa --- recipes-core/images/rpi-test-image.bb | 2 ++ recipes-core/packagegroups/packagegroup-rpi-test.bb | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-core/images/rpi-test-image.bb b/recipes-core/images/rpi-test-image.bb index b5602a6..c8dc436 100644 --- a/recipes-core/images/rpi-test-image.bb +++ b/recipes-core/images/rpi-test-image.bb @@ -1,4 +1,6 @@ # Base this image on rpi-basic-image include rpi-basic-image.bb +COMPATIBLE_MACHINE = "^rpi$" + IMAGE_INSTALL_append = " packagegroup-rpi-test" diff --git a/recipes-core/packagegroups/packagegroup-rpi-test.bb b/recipes-core/packagegroups/packagegroup-rpi-test.bb index 29e995e..029c18c 100644 --- a/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -4,8 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 inherit packagegroup +COMPATIBLE_MACHINE = "^rpi$" + +OMXPLAYER_rpi = "omxplayer" +OMXPLAYER_rpi_aarch64 = "" + RDEPENDS_${PN} = "\ - omxplayer \ + ${OMXPLAYER} \ bcm2835-tests \ wiringpi \ rpio \