diff options
Diffstat (limited to 'meta-raspberrypi')
8 files changed, 10 insertions, 30 deletions
diff --git a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index 9983b61a6..a5fe6d707 100644 --- a/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ??= "4.19.%" +PREFERRED_VERSION_linux-raspberrypi ??= "4.14.%" 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 4202651f4..c43da01ae 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 @@ -4,7 +4,7 @@ PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'g 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 xkb xkbcommon-evdev" +PACKAGECONFIG_append_rpi = " libinput examples tslib xkb xkbcommon" PACKAGECONFIG_remove_rpi = "tests" OE_QTBASE_EGLFS_DEVICE_INTEGRATION_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" diff --git a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend index 6651fb8d3..09fbaaa0d 100644 --- a/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,16 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" -BCM_BT_SOURCES = " \ +RC_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 \ " -BCM_BT_RDEPENDS = "pi-bluetooth" - -SRC_URI_append_raspberrypi0-wifi = " ${BCM_BT_SOURCES}" -SRC_URI_append_raspberrypi3 = " ${BCM_BT_SOURCES}" - -RDEPENDS_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_RDEPENDS}" -RDEPENDS_${PN}_append_raspberrypi3 = " ${BCM_BT_RDEPENDS}" +RDEPENDS_${PN}_append_rpi = " pi-bluetooth" diff --git a/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend index 698564b94..09e3ec9d0 100644 --- a/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend +++ b/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SPLASH_IMAGES_append_rpi = " file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" -ALTERNATIVE_PRIORITY_psplash-raspberrypi[psplash] = "10" - +ALTERNATIVE_PRIORITY_psplash-raspberrypi[psplash] = "200" diff --git a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb index 4311588e4..2815942e8 100644 --- a/meta-raspberrypi/recipes-graphics/userland/userland_git.bb +++ b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb @@ -90,7 +90,5 @@ FILES_${PN}-dev += "${includedir} \ FILES_${PN}-doc += "${datadir}/install" FILES_${PN}-dbg += "${libdir}/plugins/.debug" -PACKAGE_ARCH = "${MACHINE_ARCH}" - RDEPENDS_${PN} += "bash" RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb index c68d2d047..6563918cc 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb @@ -1,6 +1,6 @@ -LINUX_VERSION ?= "4.14.98" +LINUX_VERSION ?= "4.14.112" -SRCREV = "5d63a4595d32a8505590d5fea5c4ec1ca79fd49d" +SRCREV = "6b5c4a2508403839af29ef44059d04acbe0ee204" SRC_URI = " \ git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y \ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb index 0d3b7530d..8842e715b 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb @@ -1,9 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" -LINUX_VERSION ?= "4.19.32" +LINUX_VERSION ?= "4.19.34" LINUX_RPI_BRANCH ?= "rpi-4.19.y" -SRCREV = "d65a0f76d3adcf86a6f5c614c68edb3aeb3b8590" +SRCREV = "ab8652c03fa081b27de7e28a74c2536cb2aa3e5b" SRC_URI = " \ git://github.com/raspberrypi/linux.git;protocol=git;branch=${LINUX_RPI_BRANCH} \ " diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb deleted file mode 100644 index b3f324829..000000000 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -LINUX_VERSION ?= "4.9.80" - -SRCREV = "7f9c648dad6473469b4133898fa6bb8d818ecff9" -SRC_URI = " \ - git://github.com/raspberrypi/linux.git;branch=rpi-4.9.y \ - file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ - " - -require linux-raspberrypi.inc |