diff options
| author | Juergen Daubert <jue@jue.li> | 2013-11-15 14:28:13 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2013-11-15 14:28:13 +0100 |
| commit | faae14daa13edd2621a34a2eb3d64f3c60874d32 (patch) | |
| tree | 2a50bea8326c220224c4862aab4a74bb34218cab /wpa_supplicant | |
| parent | 58d9e3156dd5c68482502b4f26bed1944c2748df (diff) | |
| download | opt-faae14daa13edd2621a34a2eb3d64f3c60874d32.tar.gz opt-faae14daa13edd2621a34a2eb3d64f3c60874d32.tar.xz | |
Revert "wpa_supplicant: dbus support, FS#957"
This reverts commit b181f5d38f3ac7bac15bfca8508af0ff4bbdfc1f.
Currently we try to avoid linking against dbus whenever possible,
at least for opt-ports, e.g. cups or firefox. It's inconsistent
to break this rule for a single port like wpa_supplicant. Because
wpa_supplicant is part of our ISO, we would have to include dbus
as well, if we add dbus support to it.
We might reconsider in the future, if we come to the conclusion
that having dbus support all over is a good thing for CRUX.
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/.footprint | 8 | ||||
| -rw-r--r-- | wpa_supplicant/Pkgfile | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/wpa_supplicant/.footprint b/wpa_supplicant/.footprint index 95d9d6405..58bdf26db 100644 --- a/wpa_supplicant/.footprint +++ b/wpa_supplicant/.footprint @@ -2,10 +2,6 @@ drwxr-xr-x root/root etc/ lrwxrwxrwx root/root etc/wpa.conf -> wpa_supplicant.conf -rw------- root/root etc/wpa_supplicant.conf drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/dbus-1/ -drwxr-xr-x root/root usr/etc/dbus-1/system.d/ --rw-r--r-- root/root usr/etc/dbus-1/system.d/wpa_supplicant.conf drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/wpa_supplicant.conf.5.gz @@ -18,7 +14,3 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/wpa_cli -rwxr-xr-x root/root usr/sbin/wpa_passphrase -rwxr-xr-x root/root usr/sbin/wpa_supplicant -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/dbus-1/ -drwxr-xr-x root/root usr/share/dbus-1/system-services/ --rw-r--r-- root/root usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index 760ec4cc0..b72ed6124 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -5,7 +5,7 @@ name=wpa_supplicant version=2.0 -release=3 +release=2 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz) build () { @@ -14,7 +14,6 @@ build () { cp defconfig .config echo "CONFIG_READLINE=y CONFIG_LIBNL32=y - CONFIG_CTRL_IFACE_DBUS_NEW=y CFLAGS+=-I/usr/include/libnl3" >> .config make @@ -27,11 +26,6 @@ build () { echo -e "ctrl_interface=/var/run/wpa_supplicant\n" > $PKG/etc/wpa_supplicant.conf chmod 0600 $PKG/etc/wpa_supplicant.conf - # dbus - install -d $PKG/usr/{share/dbus-1/system-services,etc/dbus-1/system.d} - install -m 0644 dbus/fi.w1.wpa_supplicant1.service $PKG/usr/share/dbus-1/system-services/ - install -m 0644 dbus/dbus-wpa_supplicant.conf $PKG/usr/etc/dbus-1/system.d/wpa_supplicant.conf - # symlink for compatibility with older releases ln -s wpa_supplicant.conf $PKG/etc/wpa.conf } |