mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
Merge pull request #102 from shr-project/jansa/master
Fixes for bitbake world
This commit is contained in:
commit
1b589998f4
|
@ -9,7 +9,7 @@ include recipes-bsp/common/firmware.inc
|
||||||
|
|
||||||
RDEPENDS_${PN} = "rpi-config"
|
RDEPENDS_${PN} = "rpi-config"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
S = "${RPIFW_S}/boot"
|
S = "${RPIFW_S}/boot"
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ DESCRIPTION = "Commented config.txt file for the Raspberry Pi. \
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
SRCREV = "648ffc470824c43eb0d16c485f4c24816b32cd6f"
|
SRCREV = "648ffc470824c43eb0d16c485f4c24816b32cd6f"
|
||||||
SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \
|
SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
SUMMARY = "U-boot boot scripts for Raspberry Pi"
|
SUMMARY = "U-boot boot scripts for Raspberry Pi"
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||||
COMPATIBLE_MACHINE = "rpi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
DEPENDS = "u-boot-mkimage-native"
|
DEPENDS = "u-boot-mkimage-native"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
# Base this image on rpi-basic-image
|
# Base this image on rpi-basic-image
|
||||||
include rpi-basic-image.bb
|
include rpi-basic-image.bb
|
||||||
|
|
||||||
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
IMAGE_INSTALL_append = " packagegroup-rpi-test"
|
IMAGE_INSTALL_append = " packagegroup-rpi-test"
|
||||||
|
|
|
@ -4,8 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
|
||||||
|
|
||||||
inherit packagegroup
|
inherit packagegroup
|
||||||
|
|
||||||
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
|
OMXPLAYER_rpi = "omxplayer"
|
||||||
|
OMXPLAYER_rpi_aarch64 = ""
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
omxplayer \
|
${OMXPLAYER} \
|
||||||
bcm2835-tests \
|
bcm2835-tests \
|
||||||
wiringpi \
|
wiringpi \
|
||||||
rpio \
|
rpio \
|
||||||
|
|
|
@ -8,7 +8,7 @@ AUTHOR = "Mike McCauley (mikem@open.com.au)"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz"
|
SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz"
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,6 @@ 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 = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||||
|
|
|
@ -17,5 +17,5 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
|
||||||
|
|
||||||
inherit distutils
|
inherit distutils
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
|
||||||
|
|
||||||
inherit setuptools
|
inherit setuptools
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
RDEPENDS_${PN} = "\
|
RDEPENDS_${PN} = "\
|
||||||
python-logging \
|
python-logging \
|
||||||
|
|
|
@ -13,7 +13,7 @@ SRC_URI = "git://git.drogon.net/wiringPi \
|
||||||
file://0001-Add-initial-cross-compile-support.patch \
|
file://0001-Add-initial-cross-compile-support.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
CFLAGS_prepend = "-I${S}/wiringPi -I${S}/devLib "
|
CFLAGS_prepend = "-I${S}/wiringPi -I${S}/devLib "
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ PROVIDES = "virtual/libgles2 \
|
||||||
|
|
||||||
RPROVIDES_${PN} += "libgles2 egl"
|
RPROVIDES_${PN} += "libgles2 egl"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
SRCBRANCH = "master"
|
SRCBRANCH = "master"
|
||||||
SRCFORK = "raspberrypi"
|
SRCFORK = "raspberrypi"
|
||||||
|
|
|
@ -4,7 +4,7 @@ LICENSE = "Proprietary"
|
||||||
LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780"
|
LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780"
|
||||||
|
|
||||||
PROVIDES = "virtual/libgles2 virtual/egl"
|
PROVIDES = "virtual/libgles2 virtual/egl"
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
include recipes-bsp/common/firmware.inc
|
include recipes-bsp/common/firmware.inc
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' --enable-rpi-compositor WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
|
|
||||||
|
|
||||||
PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}"
|
PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}"
|
||||||
|
|
||||||
EXTRA_OECONF += "--disable-xwayland-test \
|
EXTRA_OECONF_append_rpi = " \
|
||||||
|
--disable-xwayland-test \
|
||||||
--disable-simple-egl-clients \
|
--disable-simple-egl-clients \
|
||||||
|
${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \
|
||||||
|
--enable-rpi-compositor \
|
||||||
|
--disable-resize-optimization \
|
||||||
|
--disable-setuid-install \
|
||||||
|
WESTON_NATIVE_BACKEND=rpi-backend.so \
|
||||||
|
', d)} \
|
||||||
"
|
"
|
||||||
|
|
||||||
EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--enable-rpi-compositor', d)}"
|
|
||||||
EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-resize-optimization', d)}"
|
|
||||||
EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-setuid-install', d)}"
|
|
||||||
EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ SRC_URI += " \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE = "raspberrypi"
|
COMPATIBLE_MACHINE = "^rpi$"
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
PV = "${LINUX_VERSION}+git${SRCPV}"
|
PV = "${LINUX_VERSION}+git${SRCPV}"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user