summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Brink2019-07-09 19:31:00 -0700
committerJames Brink2019-07-09 19:31:00 -0700
commit63c3f37b9e8a4055b98a32675fe9bc381d6fd6fb (patch)
tree2bf38977dbfdbe477fcea31b78ed54a64d844ffb
parentec0b3cd906960863a8f298b47b06daca8e031228 (diff)
downloadaur-63c3f37b9e8a4055b98a32675fe9bc381d6fd6fb.tar.gz
Update PKGBUILD - added conflicts for darling and darling-dkms
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 436e5f67305..0501de547ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = darling-git
pkgdesc = Darwin/macOS emulation layer for Linux
- pkgver = r2545.8df457b0
+ pkgver = r2544.ab56f320
pkgrel = 1
url = http://www.darlinghq.org
arch = x86_64
@@ -40,7 +40,7 @@ pkgbase = darling-git
depends = libunwind
options = !buildflags
source = dkms.conf
- source = git+https://github.com/darlinghq/darling.git
+ source = git+https://github.com/darlinghq/darling.git#commit=ab56f3209d75ad67a140e1f3e6baccfdca7a1c78
source = git+https://github.com/darlinghq/darling-DSTools.git
source = git+https://github.com/darlinghq/darling-DirectoryService.git
source = git+https://github.com/darlinghq/darling-Heimdal.git
@@ -239,6 +239,7 @@ pkgbase = darling-git
pkgname = darling-git
install = darling-git.install
depends = darling-mach-dkms-git
+ conflicts = darling
pkgname = darling-mach-dkms-git
depends = dkms
@@ -246,4 +247,5 @@ pkgname = darling-mach-dkms-git
optdepends = linux-lts-headers: build modules against the LTS kernel
optdepends = linux-zen-headers: build modules against the ZEN kernel
optdepends = linux-grsec-headers: build modules against the GRSEC kernel
+ conflicts = darling-mach-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 1ca643675d9..fd3327b0528 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_gitname=darling
pkgbase=$_gitname-git
pkgname=('darling-git' 'darling-mach-dkms-git')
-pkgver=r2545.8df457b0
+pkgver=r2544.ab56f320
pkgrel=1
pkgdesc="Darwin/macOS emulation layer for Linux"
arch=('x86_64')
@@ -19,7 +19,7 @@ _make_depends_x86_64=('gcc-multilib')
# Darling git repo and all submodules.
source=('dkms.conf'
- 'git+https://github.com/darlinghq/darling.git'
+ 'git+https://github.com/darlinghq/darling.git#commit=ab56f3209d75ad67a140e1f3e6baccfdca7a1c78'
'git+https://github.com/darlinghq/darling-DSTools.git'
'git+https://github.com/darlinghq/darling-DirectoryService.git'
'git+https://github.com/darlinghq/darling-Heimdal.git'
@@ -264,6 +264,7 @@ build() {
package_darling-git() {
install=darling-git.install
depends=('darling-mach-dkms-git')
+ conflicts=('darling')
cd "$srcdir/$_gitname/build"
make DESTDIR="$pkgdir" install
@@ -272,6 +273,7 @@ package_darling-git() {
package_darling-mach-dkms-git() {
depends=('dkms')
+ conflicts=('darling-mach-dkms')
optdepends=('linux-headers: build modules against the Arch kernel'
'linux-lts-headers: build modules against the LTS kernel'
'linux-zen-headers: build modules against the ZEN kernel'