summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-04-06 20:22:03 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-04-06 20:22:03 +0000
commit8c2a854351b6ea35aed27d44baff826f400a0497 (patch)
tree6a93cbbd7d76bf94bcc5243e89a10a53702fc16f
parent32b058d55db774a2547af593d041ddde8feeac91 (diff)
parent4266ce2417dd22f08c1a6e5dd18df1f050da072a (diff)
downloadpackages-8c2a854351b6ea35aed27d44baff826f400a0497.tar.gz
packages-8c2a854351b6ea35aed27d44baff826f400a0497.tar.bz2
packages-8c2a854351b6ea35aed27d44baff826f400a0497.tar.xz
packages-8c2a854351b6ea35aed27d44baff826f400a0497.zip
Merge branch 'wpa_supplicant' into 'master'
user/wpa_supplicant: Move dbus files to subpackage I don't really care whether /etc/dbus-1 is in a subpackage. Leaving it in the main package (but still removing its dependency on the dbus package) would work for me as well. See merge request !210
-rw-r--r--user/wpa_supplicant/APKBUILD27
1 files changed, 16 insertions, 11 deletions
diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD
index ba297f885..240fb474c 100644
--- a/user/wpa_supplicant/APKBUILD
+++ b/user/wpa_supplicant/APKBUILD
@@ -8,8 +8,8 @@ url="https://w1.fi/wpa_supplicant/"
arch="all"
license="BSD-3-Clause AND Public-Domain AND (GPL-2.0+ OR BSD-3-Clause)"
options="!check" # No test suite
-subpackages="$pkgname-doc $pkgname-openrc wpa_gui"
-depends="dbus"
+subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui"
+depends=""
makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev"
source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz
rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
@@ -72,15 +72,6 @@ package() {
done
install -Dm755 eapol_test "$pkgdir"/sbin/eapol_test
- # dbus
- cd dbus
- install -d "$pkgdir"/etc/dbus-1/system.d
- install -m644 dbus-wpa_supplicant.conf \
- "$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf
- install -d "$pkgdir"/usr/share/dbus-1/system-services
- install fi.epitest.hostap.WPASupplicant.service \
- "$pkgdir"/usr/share/dbus-1/system-services
- install -d "$pkgdir"/var/run/wpa_supplicant
install -Dm755 "$srcdir"/wpa_supplicant.initd \
"$pkgdir"/etc/init.d/wpa_supplicant
install -Dm644 "$srcdir"/wpa_supplicant.confd \
@@ -91,6 +82,20 @@ package() {
ln -s ../sbin/wpa_cli "$pkgdir"/bin/wpa_cli
}
+dbus() {
+ pkgdesc="$pkgdesc (dbus services)"
+ depends="$pkgname dbus"
+ install_if="$pkgname=$pkgver-r$pkgrel dbus"
+
+ cd "$builddir/wpa_supplicant/dbus"
+ install -d "$subpkgdir"/etc/dbus-1/system.d
+ install -m644 dbus-wpa_supplicant.conf \
+ "$subpkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf
+ install -d "$subpkgdir"/usr/share/dbus-1/system-services
+ install fi.epitest.hostap.WPASupplicant.service \
+ "$subpkgdir"/usr/share/dbus-1/system-services
+}
+
wpa_gui() {
pkgdesc="Graphical User Interface for wpa_supplicant"
depends="$pkgname"