summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Wambold2020-02-20 13:34:42 -0500
committerTom Wambold2020-02-20 13:34:42 -0500
commit5e2737ada6f9a74e50d9080848e3101b763bf0ee (patch)
treec28062fdd714e476ecd820ab76e0560bdddaf1aa
parent935bb470c683057f3527f68aaa4810b85678955e (diff)
downloadaur-5e2737ada6f9a74e50d9080848e3101b763bf0ee.tar.gz
Update to CORE 6.1.0 release.
* Remove unnecessary systemd patch. * Add new python-mako dependency.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD18
-rw-r--r--systemd-service-dir.patch12
3 files changed, 9 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 893895cc5579..ca5a3353ca73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = core
pkgdesc = Common Open Research Emulator
- pkgver = 6.0.0
+ pkgver = 6.1.0
pkgrel = 2
url = https://github.com/coreemu/core/
arch = i686
@@ -23,6 +23,7 @@ pkgbase = core
depends = python-future
depends = python-grpcio
depends = python-lxml
+ depends = python-mako
depends = python-netaddr
depends = python-pillow
depends = python-yaml
@@ -31,10 +32,8 @@ pkgbase = core
depends = xterm
optdepends = openvswitch: Open vSwitch support
backup = etc/core/core.conf
- source = https://github.com/coreemu/core/archive/release-6.0.0.tar.gz
- source = systemd-service-dir.patch
- md5sums = f6840ba27297b0d0168fd158a2919fd2
- md5sums = 43189fc4c5eff0bfbf0464c407a15bec
+ source = https://github.com/coreemu/core/archive/release-6.1.0.tar.gz
+ md5sums = 0c7a30066bb0847022a38286521d3717
pkgname = core
diff --git a/PKGBUILD b/PKGBUILD
index b851851d782a..92ee70ac8e5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Tom Wambold <tom5760@gmail.com>
pkgname=core
-pkgver=6.0.0
+pkgver=6.1.0
pkgrel=2
pkgdesc="Common Open Research Emulator"
arch=('i686' 'x86_64')
@@ -8,22 +8,14 @@ url="https://github.com/coreemu/core/"
license=('BSD')
depends=('bridge-utils' 'ebtables' 'ethtool' 'fabric' 'iproute2' 'libev'
'openvswitch' 'procps-ng' 'python3' 'python-future' 'python-grpcio'
- 'python-lxml' 'python-netaddr' 'python-pillow' 'python-yaml' 'tkimg'
- 'util-linux' 'xterm')
+ 'python-lxml' 'python-mako' 'python-netaddr' 'python-pillow' 'python-yaml'
+ 'tkimg' 'util-linux' 'xterm')
makedepends=('help2man' 'imagemagick' 'python-sphinx' 'python-grpcio-tools'
'openvswitch')
optdepends=('openvswitch: Open vSwitch support')
backup=('etc/core/core.conf')
-source=("https://github.com/coreemu/core/archive/release-$pkgver.tar.gz"
- 'systemd-service-dir.patch')
-md5sums=('f6840ba27297b0d0168fd158a2919fd2'
- '43189fc4c5eff0bfbf0464c407a15bec')
-
-prepare() {
- cd "$srcdir/core-release-$pkgver"
-
- patch -p1 < "$srcdir/systemd-service-dir.patch"
-}
+source=("https://github.com/coreemu/core/archive/release-$pkgver.tar.gz")
+md5sums=('0c7a30066bb0847022a38286521d3717')
build() {
cd "$srcdir/core-release-$pkgver"
diff --git a/systemd-service-dir.patch b/systemd-service-dir.patch
deleted file mode 100644
index 276c561e3cfd..000000000000
--- a/systemd-service-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/scripts/Makefile.am b/scripts/Makefile.am
---- a/scripts/Makefile.am 2019-10-12 17:26:38.000000000 -0400
-+++ b/scripts/Makefile.am 2019-11-13 14:57:54.735399061 -0500
-@@ -22,7 +22,7 @@
- startup_SCRIPTS = core-daemon
- endif
- if WANT_SYSTEMD
--startupdir = /etc/systemd/system
-+startupdir = /usr/lib/systemd/system
- startup_SCRIPTS = core-daemon.service
- endif
-