[PR PATCH] rpi-kernel: unbreak

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages rpi-kernel-aarch64-buildfix
https://github.com/void-linux/void-packages/pull/12758

rpi-kernel: unbreak
Fixes: #12665

A patch file from https://github.com/void-linux/void-packages/pull/12758.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi-kernel-aarch64-buildfix-12758.patch --]
[-- Type: application/text/x-diff, Size: 2662 bytes --]

From 70ff361f0b9330f72f78f2e4866a5acc491530af Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 30 Jun 2019 16:51:45 +0200
Subject: [PATCH] rpi-kernel: unbreak

Fixes: #12665

[skip travis]
---
 .../patches/bcmrpi3_defconfig-drop-v4l2.patch | 30 +++++++++++++++++++
 srcpkgs/rpi-kernel/template                   |  6 +---
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/rpi-kernel/patches/bcmrpi3_defconfig-drop-v4l2.patch

diff --git a/srcpkgs/rpi-kernel/patches/bcmrpi3_defconfig-drop-v4l2.patch b/srcpkgs/rpi-kernel/patches/bcmrpi3_defconfig-drop-v4l2.patch
new file mode 100644
index 00000000000..2ef6665c0cb
--- /dev/null
+++ b/srcpkgs/rpi-kernel/patches/bcmrpi3_defconfig-drop-v4l2.patch
@@ -0,0 +1,30 @@
+# reason: https://github.com/raspberrypi/linux/issues/3024
+# src: upstream
+
+From e8a66b4f610b3a20bae8f706256d230135916c26 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Fri, 28 Jun 2019 16:05:25 +0100
+Subject: [PATCH] configs: Drop V4L2 camera and codec drivers from
+ bcmrpi3_defconfig
+
+They rely on mmal_vchiq, which in turn wants vc-sm-cma.
+vc-sm-cma needs some attention for 64 bit, so drop it for now.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ arch/arm64/configs/bcmrpi3_defconfig | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
+index 904163e4266dd..e81b099bd5420 100644
+--- arch/arm64/configs/bcmrpi3_defconfig
++++ arch/arm64/configs/bcmrpi3_defconfig
+@@ -1086,8 +1086,6 @@ CONFIG_FB_TFT_WATTEROTT=m
+ CONFIG_FB_FLEX=m
+ CONFIG_FB_TFT_FBTFT_DEVICE=m
+ CONFIG_SND_BCM2835=m
+-CONFIG_VIDEO_BCM2835=m
+-CONFIG_VIDEO_CODEC_BCM2835=m
+ CONFIG_MAILBOX=y
+ CONFIG_BCM2835_MBOX=y
+ # CONFIG_IOMMU_SUPPORT is not set
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 97168e29ad5..f1ebc0e4e56 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -10,7 +10,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
 version=4.19.55
-revision=1
+revision=2
 wrksrc="linux-${_githash}"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="http://www.kernel.org"
@@ -41,10 +41,6 @@ mutable_files="
 	/usr/lib/modules/${_kernver}/modules.alias.bin
 	/usr/lib/modules/${_kernver}/modules.devname"
 
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/20841/steps/shell_3/logs/stdio" ;;
-esac
-
 pre_configure() {
 	# Remove .git directory, otherwise scripts/setkernelversion.sh
 	# modifies KERNELRELEASE and appends + to it.