aboutsummaryrefslogtreecommitdiffstats
path: root/community/jool-tools/APKBUILD
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2019-11-09 17:13:00 +0100
committerJakub Jirutka <jakub@jirutka.cz>2019-11-09 18:51:27 +0100
commita4e032f7e9d49cbff658217b555b7f7c4b4787e2 (patch)
tree2ed17e0758c89ab71b166463bbf0dfcf51ff84f8 /community/jool-tools/APKBUILD
parent8f704e8ed9ea76765fa931b5f38ca3b3a665f9e4 (diff)
downloadaports-a4e032f7e9d49cbff658217b555b7f7c4b4787e2.tar.bz2
aports-a4e032f7e9d49cbff658217b555b7f7c4b4787e2.tar.xz
community/jool-tools: merge subpkg joold into base pkg
It would be better to split even jool and jool_siit into separate packages, but then automatic installation of kernel modules using install_if mechanism would not work. Separating just joold is a bit inconsistent and not worth it.
Diffstat (limited to 'community/jool-tools/APKBUILD')
-rw-r--r--community/jool-tools/APKBUILD20
1 files changed, 5 insertions, 15 deletions
diff --git a/community/jool-tools/APKBUILD b/community/jool-tools/APKBUILD
index 1bc5b9d3f7..f9910c362c 100644
--- a/community/jool-tools/APKBUILD
+++ b/community/jool-tools/APKBUILD
@@ -4,7 +4,7 @@ _projname=jool
pkgname=jool-tools
# Keep in sync with _ver in community/jool-modules-vanilla!
pkgver=4.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace control tools for SIIT / NAT64 Jool"
url="https://www.jool.mx"
arch="all"
@@ -12,7 +12,6 @@ license="GPL-2.0-only"
depends="ethtool"
makedepends="argp-standalone iptables-dev libnl3-dev"
subpackages="
- joold
$pkgname-static
$pkgname-doc
$pkgname-bash-completion:bashcomp:noarch
@@ -44,22 +43,13 @@ build() {
package() {
make install DESTDIR="$pkgdir"
- install -D -m 644 "$srcdir"/jool.conf "$pkgdir"/etc/jool/jool.conf
- install -D -m 644 "$srcdir"/jool_siit.conf "$pkgdir"/etc/jool/jool_siit.conf
+ install -D -m 0644 "$srcdir"/jool.conf "$pkgdir"/etc/jool/jool.conf
+ install -D -m 0644 "$srcdir"/jool_siit.conf "$pkgdir"/etc/jool/jool_siit.conf
+ install -D -m 0644 "$srcdir"/joold.conf "$subpkgdir"/etc/jool/joold.conf
- install -D -m 755 "$srcdir"/jool.initd "$pkgdir"/etc/init.d/jool
+ install -D -m 0755 "$srcdir"/jool.initd "$pkgdir"/etc/init.d/jool
ln -s jool "$pkgdir"/etc/init.d/jool_siit
-}
-
-joold() {
- pkgdesc="Userspace Session Synchronization (SS) daemon for NAT64 Jool"
- depends="$pkgname=$pkgver-r$pkgrel"
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/joold "$subpkgdir"/usr/bin/
-
install -D -m 0755 "$srcdir"/joold.initd "$subpkgdir"/etc/init.d/joold
- install -D -m 0644 "$srcdir"/joold.conf "$subpkgdir"/etc/jool/joold.conf
}
bashcomp() {