Update to 2.6.0

5 files changed, 23 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d4bd8561522..ac118d0ef403 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = onos
 	pkgdesc = Open Network Operating System
-	pkgver = 2.3.0
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = https://onosproject.org
 	install = onos.install
 	arch = any
 	license = Apache
-	depends = jdk8-openjdk
+	depends = java-environment=11
 	depends = curl
-	source = https://repo1.maven.org/maven2/org/onosproject/onos-releases/2.3.0/onos-2.3.0.tar.gz
+	source = https://repo1.maven.org/maven2/org/onosproject/onos-releases/2.6.0/onos-2.6.0.tar.gz
 	source = onos.service
-	sha512sums = aed29302378947d3e6a7f983548e658778c58c758d32e171464735c8cbb468aef8ec076ff6d9e7b9910558ee04aea9ce2788cb3384fb95707cd771346b524cc7
-	sha512sums = d8ce4939dda326ebdb4c98d0dd03cded42fe0b64ef004f1a1de5dd74942724991e3c481dd400aea6f310f3804a83a0995c65ad4962f97004dd6ebb2095f5684b
+	source = onos.conf
+	sha256sums = 79320d43724c56bb0f3ab219ba83857742a33223cbec558f261fce3daf054c54
+	sha256sums = fff8c6f8c45fc48580bcd934c4a2822d7e0ca958a044596e8cadc2d2c32efabb
+	sha256sums = 37f7e903cc875eca54b9d7d85722f0d78be124dc2c6d2a23b646d7d46b5eec0e
 
 pkgname = onos
-
diff --git a/PKGBUILD b/PKGBUILD
index 26918f167876..a47a81a2a2ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
-# Submitter: Kuan-Yen Chou <forendef2846@gmail.com>
+# Maintainer: Kuan-Yen Chou <kychou2@illinois.edu>
 
 pkgname=onos
-pkgver=2.3.0
+pkgver=2.6.0
 pkgrel=1
 pkgdesc='Open Network Operating System'
 arch=('any')
 url='https://onosproject.org'
 license=('Apache')
-depends=('jdk8-openjdk' 'curl')
+depends=('java-environment=11' 'curl')
 install=onos.install
 source=("https://repo1.maven.org/maven2/org/onosproject/onos-releases/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "onos.service")
-sha512sums=('aed29302378947d3e6a7f983548e658778c58c758d32e171464735c8cbb468aef8ec076ff6d9e7b9910558ee04aea9ce2788cb3384fb95707cd771346b524cc7'
-            'd8ce4939dda326ebdb4c98d0dd03cded42fe0b64ef004f1a1de5dd74942724991e3c481dd400aea6f310f3804a83a0995c65ad4962f97004dd6ebb2095f5684b')
+        'onos.service'
+        'onos.conf')
+sha256sums=('79320d43724c56bb0f3ab219ba83857742a33223cbec558f261fce3daf054c54'
+            'fff8c6f8c45fc48580bcd934c4a2822d7e0ca958a044596e8cadc2d2c32efabb'
+            '37f7e903cc875eca54b9d7d85722f0d78be124dc2c6d2a23b646d7d46b5eec0e')
 
 package() {
     mkdir -p "$pkgdir/opt"
     mv "$srcdir/$pkgname-$pkgver" "$pkgdir/opt/$pkgname"
     install -Dm 644 "$srcdir/onos.service" -t "$pkgdir/usr/lib/systemd/system"
+    install -Dm 644 "$srcdir/onos.conf" -t "$pkgdir/usr/lib/sysusers.d"
     install -dm 755 "$pkgdir/usr/bin"
     for bin in "$pkgdir/opt/$pkgname/bin"/*; do
         ln -s "/opt/$pkgname/bin/$(basename $bin)" \
diff --git a/onos.conf b/onos.conf
new file mode 100644
index 000000000000..4ef95760cc41
--- /dev/null
+++ b/onos.conf
@@ -0,0 +1,3 @@
+# ONOS daemon user and group through systemd-sysusers
+
+u sdn - "SDN/ONOS daemon user" /opt/onos /bin/bash
diff --git a/onos.install b/onos.install
index c15f62e918e8..1d7d09069a42 100644
--- a/onos.install
+++ b/onos.install
@@ -3,7 +3,7 @@ post_install() {
         groupadd sdn --system
     fi
     if ! getent passwd sdn >/dev/null; then
-        useradd -c 'ONOS user' -g sdn -d '/opt/onos' -s /bin/bash sdn --system
+        useradd -c 'SDN/ONOS daemon user' -g sdn -d '/opt/onos' -s /bin/bash sdn --system
     fi
 
     chown -R sdn:sdn '/opt/onos'
diff --git a/onos.service b/onos.service
index 9a0145eefca2..bc49e15b46f1 100644
--- a/onos.service
+++ b/onos.service
@@ -5,14 +5,14 @@ After=local-fs.target
 
 [Service]
 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
+RestartSec=2s
 User=sdn
 Group=sdn
 
 [Install]
 WantedBy=multi-user.target
+
+# vim: set ft=systemd :