diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-08 14:14:43 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-12-08 14:20:36 +0100 |
| commit | 959e6f356eb15f54958ed08ec260e6941658bfdd (patch) | |
| tree | 5be7ea8c1e194b546a690159419929f90efe395c /testing/kea | |
| parent | 8ef2a1f4acf86217a0dba0edcfa2fcc3c1ba5372 (diff) | |
| download | aports-959e6f356eb15f54958ed08ec260e6941658bfdd.tar.bz2 aports-959e6f356eb15f54958ed08ec260e6941658bfdd.tar.xz | |
testing/kea: move common libs and dirs to subpkg -common
And make kea package depend on kea-dhcp4 and kea-dhcp6, i.e. change it
into a meta package. The reason is to make it less confusing for users
who install just "kea" package.
Diffstat (limited to 'testing/kea')
| -rw-r--r-- | testing/kea/APKBUILD | 26 | ||||
| -rw-r--r-- | testing/kea/kea-common.pre-install (renamed from testing/kea/kea.pre-install) | 0 |
2 files changed, 22 insertions, 4 deletions
diff --git a/testing/kea/APKBUILD b/testing/kea/APKBUILD index 1359bc40fd..a951469635 100644 --- a/testing/kea/APKBUILD +++ b/testing/kea/APKBUILD @@ -4,11 +4,11 @@ pkgname=kea pkgver=1.7.2 pkgrel=3 -pkgdesc="Common files and libraries for Kea DHCP Server" +pkgdesc="DHCPv4 and DHCPv6 server from ISC" url="http://kea.isc.org" arch="all !armhf !armv7" license="MPL2" -depends="" +depends="kea-dhcp4 kea-dhcp6" checkdepends="procps" makedepends=" bison @@ -23,7 +23,7 @@ makedepends=" " pkgusers="kea" pkggroups="kea" -install="$pkgname.pre-install" +install="$pkgname-common.pre-install" subpackages=" $pkgname-doc $pkgname-static @@ -38,6 +38,7 @@ subpackages=" $pkgname-keactrl::noarch $pkgname-shell::noarch $pkgname-utils + $pkgname-common " source="https://ftp.isc.org/isc/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz disable-db-tests.patch @@ -104,7 +105,7 @@ package() { admin() { pkgdesc="Databases administration tools for Kea DHCP server" - depends="$pkgname=$pkgver-r$pkgrel" + depends="$pkgname-common=$pkgver-r$pkgrel" amove ./usr/sbin/kea-admin amove ./usr/share/kea/ @@ -112,6 +113,7 @@ admin() { ctrlagent() { pkgdesc="Kea Control Agent - REST service for controlling Kea DHCP server" + depends="$pkgname-common=$pkgver-r$pkgrel" amove usr/sbin/kea-ctrl-agent amove ./etc/kea/kea-ctrl-agent.conf @@ -121,6 +123,7 @@ ctrlagent() { dhcpddns() { pkgdesc="Kea DHCP Dynamic DNS Server" + depends="$pkgname-common=$pkgver-r$pkgrel" amove ./usr/sbin/kea-dhcp-ddns amove ./etc/kea/kea-dhcp-ddns.conf @@ -131,6 +134,7 @@ dhcpddns() { dhcp4() { pkgdesc="Kea IPv4 DHCP Server" + depends="$pkgname-common=$pkgver-r$pkgrel" amove ./usr/sbin/kea-dhcp4 amove ./etc/kea/kea-dhcp4.conf @@ -140,6 +144,7 @@ dhcp4() { dhcp6() { pkgdesc="Kea IPv6 DHCP Server" + depends="$pkgname-common=$pkgver-r$pkgrel" amove ./usr/sbin/kea-dhcp6 amove ./etc/kea/kea-dhcp6.conf @@ -149,17 +154,21 @@ dhcp6() { hooks() { pkgdesc="Hooks libraries for Kea DHCP server" + depends="" amove ./usr/lib/kea/hooks/ } # Needed only by ctrl-agent and hooks. http() { + depends="" + amove ./usr/lib/libkea-http.so* } keactrl() { pkgdesc="Kea DHCP Process Manager" + depends="" amove ./usr/sbin/keactrl amove ./etc/kea/keactrl.conf @@ -175,10 +184,19 @@ shell() { utils() { pkgdesc="Optional utilities for Kea DHCP Server" + depends="" amove ./usr/sbin/kea-lfc } +common() { + pkgdesc="Common files and libraries for Kea DHCP Server" + depends="" + + mkdir -p "$subpkgdir" + mv "$pkgdir"/* "$subpkgdir"/ +} + _install_initd() { local name="$1" diff --git a/testing/kea/kea.pre-install b/testing/kea/kea-common.pre-install index 820a35b364..820a35b364 100644 --- a/testing/kea/kea.pre-install +++ b/testing/kea/kea-common.pre-install |