diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-02 09:13:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-02 09:34:24 +0000 |
| commit | 1ff50be4b5fe1e5e9c94501a756a31aed6efe9be (patch) | |
| tree | 671091a56e9a52662c5d851005c8019008084acb | |
| parent | 8ecbcdec5c10e501b17cb590f4f5743431af0ce0 (diff) | |
main/wpa_supplicant: move wpa_cli to its own aport in community
wpa_supplicant depends on qt5 which is in community. We need
wpa_supplicant itself to stay in main so we split the wpa_cli to its own
aport in community.
| -rw-r--r-- | community/wpa_gui/APKBUILD | 29 | ||||
| -rw-r--r-- | main/wpa_supplicant/APKBUILD | 22 |
2 files changed, 33 insertions, 18 deletions
diff --git a/community/wpa_gui/APKBUILD b/community/wpa_gui/APKBUILD new file mode 100644 index 00000000000..7505fdb1b99 --- /dev/null +++ b/community/wpa_gui/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wpa_gui +pkgver=2.6 +pkgrel=0 +pkgdesc="Grafical User Interface for wpa_supplicant" +url="https://w1.fi/wpa_supplicant/" +arch="all" +license="BSD" +makedepends="dbus-dev qt5-qtbase-dev" +source="http://w1.fi/releases/wpa_supplicant-$pkgver.tar.gz" +options="!check" + +# upgrade compatibility. this can removed after v3.7 +provides="wpa_supplicant-gui" + +builddir="$srcdir"/wpa_supplicant-$pkgver +build() { + cd "$builddir"/wpa_supplicant + qmake-qt5 -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro + make -C wpa_gui-qt4 +} + +package() { + cd "$builddir"/wpa_supplicant + install -d "$pkgdir"/usr/bin + install -m 0755 wpa_gui-qt4/wpa_gui "$pkgdir"/usr/bin/wpa_gui +} + +sha512sums="46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 wpa_supplicant-2.6.tar.gz" diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD index 2c917603a75..d9ad8d6f89e 100644 --- a/main/wpa_supplicant/APKBUILD +++ b/main/wpa_supplicant/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wpa_supplicant pkgver=2.6 -pkgrel=5 +pkgrel=6 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" license="BSD" -subpackages="$pkgname-doc $pkgname-gui" -makedepends="libressl-dev dbus-dev libnl3-dev qt5-qtbase-dev pcsc-lite-dev" +subpackages="$pkgname-doc" +makedepends="libressl-dev dbus-dev libnl3-dev pcsc-lite-dev" source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz wpa_supplicant.initd wpa_supplicant.confd @@ -30,8 +30,6 @@ prepare() { build() { cd "$builddir"/wpa_supplicant make LIBDIR=/lib BINDIR=/sbin - qmake-qt5 -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro - make -C wpa_gui-qt4 make eapol_test } @@ -46,16 +44,10 @@ package() { local man= for man in doc/docbook/*.?; do install -Dm644 "$man" \ - "$pkgdir"/usr/share/man/man${man##*.}/${man##*/} \ - || return 1 + "$pkgdir"/usr/share/man/man${man##*.}/${man##*/} done install -Dm755 eapol_test "$pkgdir"/sbin/eapol_test - # gui - install -d "$pkgdir"/usr/bin - install -m 0755 wpa_gui-qt4/wpa_gui "$pkgdir"/usr/bin/wpa_gui \ - || return 1 - # dbus cd dbus install -d "$pkgdir"/etc/dbus-1/system.d @@ -71,12 +63,6 @@ package() { "$pkgdir"/etc/conf.d/wpa_supplicant } -gui() { - pkgdesc="Grafical User Interface for $pkgname" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/wpa_gui "$subpkgdir"/usr/bin/ -} - sha512sums="46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 wpa_supplicant-2.6.tar.gz 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc wpa_supplicant.initd 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd |