summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Brink2019-05-30 15:02:25 -0700
committerJames Brink2019-05-30 15:02:25 -0700
commitb5f5d1740086dae0217cac74ba5c1b65b5f6cd64 (patch)
treeafd7af8c38c5f8be43dbea8c32a3446c30c4fbe1
parent4dc2fc7ef5dde25707ad521a830b9161c6e400b7 (diff)
downloadaur-b5f5d1740086dae0217cac74ba5c1b65b5f6cd64.tar.gz
Fix builds for kernels < 5.1
The previous patch addressed build issues for kernels >= 5.1, but incidentally broke builds on older kernels. This patch addresses both old and new kernels.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--linux-5.1.patch12
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 91567b7a917..c948f3c73dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = darling-git
pkgdesc = Darwin/macOS emulation layer for Linux
- pkgver = r2535.9abed516
+ pkgver = r2543.567a5a27
pkgrel = 1
url = http://www.darlinghq.org
arch = x86_64
@@ -139,7 +139,7 @@ pkgbase = darling-git
source = git+https://github.com/darlinghq/darling-zsh.git
source = git+https://github.com/darlinghq/darling-newlkm.git
md5sums = d6d3b392245a45c6fb5f82037bfdbd19
- md5sums = 5349a07c2b26caa1220929878adcecad
+ md5sums = 44d85fe17105c7ede4d334f05cf3e77e
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4f7ed67018f..d17998bdd45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_gitname=darling
pkgbase=$_gitname-git
pkgname=('darling-git' 'darling-mach-dkms-git')
-pkgver=r2535.9abed516
+pkgver=r2543.567a5a27
pkgrel=1
pkgdesc="Darwin/macOS emulation layer for Linux"
arch=('x86_64')
@@ -119,7 +119,7 @@ source=('dkms.conf'
'git+https://github.com/darlinghq/darling-newlkm.git')
# We skip md5 on all git repos
-md5sums=('d6d3b392245a45c6fb5f82037bfdbd19' '5349a07c2b26caa1220929878adcecad'
+md5sums=('d6d3b392245a45c6fb5f82037bfdbd19' '44d85fe17105c7ede4d334f05cf3e77e'
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
diff --git a/linux-5.1.patch b/linux-5.1.patch
index a0dedcf9d6c..a6c9ffb3314 100644
--- a/linux-5.1.patch
+++ b/linux-5.1.patch
@@ -11,15 +11,17 @@ index 4945e87..7b0b886 100644
#include <linux/fs.h>
#include <linux/file.h>
diff --git a/darling/traps.c b/darling/traps.c
-index be0aecb..05c707c 100644
+index be0aecb..732211f 100644
--- a/darling/traps.c
+++ b/darling/traps.c
-@@ -385,7 +385,7 @@ static void darling_ipc_inherit(task_t old_task, task_t new_task)
+@@ -384,7 +384,9 @@ static void darling_ipc_inherit(task_t old_task, task_t new_task)
+ }
// No vma from 4.11
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
--static int mach_mmap_fault(struct vm_fault *vmf)
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+static vm_fault_t mach_mmap_fault(struct vm_fault *vmf)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+ static int mach_mmap_fault(struct vm_fault *vmf)
#else
static int mach_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- #endif