Revert "wpa_supplicant: dbus support, FS#957"
This reverts commit b181f5d38f
.
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.
This commit is contained in:
parent
58d9e3156d
commit
faae14daa1
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user