summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorben Krüger2021-01-28 10:07:32 +0100
committerThorben Krüger2021-01-28 10:07:32 +0100
commitf50ee15002336a26bd8129efed9457b28a5556d8 (patch)
tree9deaf915a776ca347ac0bced43ba55563f29a3bb
parent81eeec6ef2a2a4fdf7771216e5dc89d96a34e5e5 (diff)
downloadaur-f50ee15002336a26bd8129efed9457b28a5556d8.tar.gz
minor consistency issues fixed
-rw-r--r--PKGBUILD8
-rw-r--r--scion-daemon.service1
-rw-r--r--scion-dispatcher.service2
3 files changed, 2 insertions, 9 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0fb974bfa128..91752f43851f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,7 @@
# Maintainer: Thorben Krüger <thorben.krueger@ovgu.de>
pkgname=scionlab-git
pkgver=v2020.12.r5.ga90f354e
-pkgrel=4
-epoch=
+pkgrel=5
pkgdesc="A global research network to test the SCION next-generation internet architecture"
arch=('x86_64')
url="https://www.scionlab.org"
@@ -52,9 +51,6 @@ pkgver() {
}
prepare() {
- #cd "$pkgname-$pkgver"
- #unset GIT_LFS_SKIP_SMUDGE
-
cd "$srcdir/"
git clone $_scionlab_source scionlab
pushd scionlab
@@ -69,7 +65,6 @@ prepare() {
build() {
cd "$srcdir/scion"
- #cd "$pkgname-$pkgver"
"$srcdir/go/bin/go" build -o ./bin/ -v \
-ldflags="-s -w -X github.com/scionproto/scion/go/lib/env.StartupVersion=$(git describe --tags)-scionlab"\
./go/posix-router/\
@@ -108,7 +103,6 @@ package() {
install -Dm755 scionlab/hostfiles/scionlab-config "$pkgdir/usr/bin/scionlab-config"
popd
pushd "$srcdir/scion"
- #cd "$pkgname-$pkgver"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
pushd "bin"
install -Dm755 posix-router "$pkgdir/usr/bin/scion-border-router"
diff --git a/scion-daemon.service b/scion-daemon.service
index 83b77d019802..e58e9daefbd5 100644
--- a/scion-daemon.service
+++ b/scion-daemon.service
@@ -9,7 +9,6 @@ PartOf=scionlab.target
Type=simple
User=scion
Group=scion
-ExecStartPre=/bin/rm -rf /run/shm/sciond/
ExecStart=/usr/bin/sciond --config /etc/scion/sciond.toml
RemainAfterExit=False
KillMode=control-group
diff --git a/scion-dispatcher.service b/scion-dispatcher.service
index b90cc16e96e8..a99e578d8b39 100644
--- a/scion-dispatcher.service
+++ b/scion-dispatcher.service
@@ -9,7 +9,7 @@ PartOf=scionlab.target
Type=simple
User=scion
Group=scion
-ExecStartPre=/bin/rm -rf /run/shm/dispatcher/
+ExecStartPre=/bin/rm -rf /dev/shm/dispatcher/
ExecStart=/usr/bin/scion-dispatcher --config /etc/scion/dispatcher.toml
RemainAfterExit=False
LimitNOFILE=4096