diff --git a/core/linux-raspberrypi-latest/PKGBUILD b/core/linux-raspberrypi-latest/PKGBUILD index da875c31f..89a7db226 100644 --- a/core/linux-raspberrypi-latest/PKGBUILD +++ b/core/linux-raspberrypi-latest/PKGBUILD @@ -10,7 +10,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="Raspberry Pi" pkgver=3.14.4 -pkgrel=1 +pkgrel=2 bfqver=v7r3 arch=('arm armv6h') diff --git a/core/linux-raspberrypi-latest/linux-raspberrypi-latest.install b/core/linux-raspberrypi-latest/linux-raspberrypi-latest.install index c6690c38e..a6d6b692d 100644 --- a/core/linux-raspberrypi-latest/linux-raspberrypi-latest.install +++ b/core/linux-raspberrypi-latest/linux-raspberrypi-latest.install @@ -4,10 +4,20 @@ KERNEL_NAME=-raspberrypi-latest KERNEL_VERSION=3.14.2-1-ARCH +disable_cma() { + if [[ -f /boot/config.txt && $(grep '^cma' /boot/config.txt) != '' ]]; then + echo ">>> You appear to have dynamic memory (CMA) enabled, which is currently broken" + echo ">>> in newer kernels and will cause many issues if left enabled." + echo ">>> Disabling that for you now." + sed -i 's/^cma_/#cma_/g' /boot/config.txt + fi +} + post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} + disable_cma } post_upgrade() { @@ -21,4 +31,5 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} + disable_cma }