summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkyechou2019-04-17 15:12:58 -0500
committerkyechou2019-04-17 15:12:58 -0500
commit70879e6163a92d9780c353168592f99934608b86 (patch)
tree7872fe1b45aae57981ba2ec55919109e85fa2bbd
parentee9d4332e95f80038107b2aab0ad43dc229828a2 (diff)
downloadaur-70879e6163a92d9780c353168592f99934608b86.tar.gz
Update to 1.15.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--onos.install4
-rw-r--r--onos.service7
4 files changed, 21 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99966b270045..0fd260c4dc55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
pkgbase = onos
pkgdesc = Open Network Operating System
- pkgver = 1.14.1
+ pkgver = 1.15.0
pkgrel = 1
url = https://onosproject.org
install = onos.install
- arch = x86_64
+ arch = any
license = Apache
depends = jdk8-openjdk
depends = curl
- source = https://repo1.maven.org/maven2/org/onosproject/onos-releases/1.14.1/onos-1.14.1.tar.gz
+ source = https://repo1.maven.org/maven2/org/onosproject/onos-releases/1.15.0/onos-1.15.0.tar.gz
source = onos.service
- sha256sums = b452cf657ddcebf04cc8265bb0bee186559242dfc9cadbf3ea94433e9806f435
- sha256sums = c5d5b1c5f21acee1efe8f491a3ee033f56f528d2b41ffe8509b8142bae923759
+ sha256sums = 3bba44078745c8f6382ea00f898d2df8bc4edff717ab73415ad2ffc7c15c9031
+ sha256sums = 4837f3e924c5806a0095f013099e2f8c959389d1c3c57820c512cfe7d2e14fbd
pkgname = onos
diff --git a/PKGBUILD b/PKGBUILD
index f1f58fca2d85..c928ceaea28f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,23 @@
# Submitter: Kuan-Yen Chou <forendef2846@gmail.com>
pkgname=onos
-pkgver=1.14.1
+pkgver=1.15.0
pkgrel=1
pkgdesc='Open Network Operating System'
-arch=('x86_64')
+arch=('any')
url='https://onosproject.org'
license=('Apache')
depends=('jdk8-openjdk' 'curl')
install=onos.install
source=("https://repo1.maven.org/maven2/org/onosproject/onos-releases/${pkgver}/${pkgname}-${pkgver}.tar.gz"
"onos.service")
-sha256sums=('b452cf657ddcebf04cc8265bb0bee186559242dfc9cadbf3ea94433e9806f435'
- 'c5d5b1c5f21acee1efe8f491a3ee033f56f528d2b41ffe8509b8142bae923759')
+sha256sums=('3bba44078745c8f6382ea00f898d2df8bc4edff717ab73415ad2ffc7c15c9031'
+ '4837f3e924c5806a0095f013099e2f8c959389d1c3c57820c512cfe7d2e14fbd')
package() {
- cd "${srcdir}"
- mkdir -p "${pkgdir}/opt"
- mv "${pkgname}-${pkgver}" "${pkgdir}/opt/${pkgname}"
- install -Dm 644 "${srcdir}/onos.service" -t "${pkgdir}/usr/lib/systemd/system"
+ mkdir -p "$pkgdir/opt"
+ mv "$srcdir/$pkgname-$pkgver" "$pkgdir/opt/$pkgname"
+ install -Dm 644 "$srcdir/onos.service" -t "$pkgdir/usr/lib/systemd/system"
}
# vim: set ts=4 sw=4 et:
diff --git a/onos.install b/onos.install
index fe8ec638668e..c15f62e918e8 100644
--- a/onos.install
+++ b/onos.install
@@ -9,4 +9,8 @@ post_install() {
chown -R sdn:sdn '/opt/onos'
}
+post_upgrade() {
+ post_install
+}
+
# vim: set ts=4 sw=4 et:
diff --git a/onos.service b/onos.service
index 6bda4dcd1f5d..9a0145eefca2 100644
--- a/onos.service
+++ b/onos.service
@@ -4,8 +4,11 @@ After=network-online.target
After=local-fs.target
[Service]
-Type=simple
-ExecStart=/opt/onos/bin/onos-service -server
+Type=exec
+Environment="JAVA_HOME=/usr/lib/jvm/default"
+ExecStart=/opt/onos/bin/onos-service server
+ExecStop=/opt/onos/bin/onos-service stop
+SuccessExitStatus=143
Restart=always
RestartSec=1s
User=sdn