Commit 7acad73d authored by tcely's avatar tcely Committed by Natanael Copa

main/dhcp: fix circular dependencies

parent 76420ca7
......@@ -2,13 +2,12 @@
pkgname=dhcp
pkgver=4.4.1
_realver=${pkgver/_p/-P}
pkgrel=3
pkgrel=4
pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
url="https://www.isc.org/"
arch="all"
license="MPL-2.0"
depends="$pkgname-server"
depends_server_empty="$pkgname-server-vanilla"
depends=""
depends_server_ldap="!$pkgname-server-vanilla $pkgname"
depends_server_vanilla="!$pkgname-server-ldap $pkgname"
#
......@@ -28,8 +27,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-dev $pkgname-dbg $pkgname-openrc
dhclient dhcrelay dhcrelay-openrc
$pkgname-server-vanilla:server_vanilla
$pkgname-server-ldap:server_ldap
$pkgname-server:server_empty:noarch"
$pkgname-server-ldap:server_ldap"
source="http://ftp.isc.org/isc/$pkgname/${_realver}/$pkgname-$_realver.tar.gz
01-dhclient-script-fix-bare-ip.patch
02-dhclient-script-remove-bashisms.patch
......@@ -142,15 +140,6 @@ openrc() {
install_if="openrc ${_name}=$pkgver-r$pkgrel"
}
server_empty() {
pkgdesc="ISC dhcpd server (virtual)"
depends="$depends_server_empty"
provider_priority=0
install -d "$subpkgdir"
rmdir "$pkgdir/usr/sbin" || :
}
server_ldap() {
pkgdesc="ISC dhcpd server with LDAP support"
depends="$depends_server_ldap"
......@@ -166,11 +155,13 @@ server_ldap() {
server_vanilla() {
pkgdesc="ISC dhcpd server"
depends="$depends_server_vanilla"
install_if="$pkgname=$pkgver-r$pkgrel"
provides="dhcp-server"
provider_priority=200
install -d "$subpkgdir"/usr/sbin
mv "$pkgdir/usr/sbin/dhcpd" "$subpkgdir/usr/sbin/"
rmdir "$pkgdir/usr/sbin" || :
}
dhclient() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment