[oe-commits] Steve Sakoman : wpa-supplicant: Enable CONFIG_CTRL_IFACE_DBUS and CONFIG_CTRL_IFACE_DBUS_NEW

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=aa35ba5cf7e1bf30fb2edb1408c0b599ec89290a

Author: Steve Sakoman <steve at sakoman.com>
Date:   Tue Apr 19 08:40:52 2011 -0700

wpa-supplicant: Enable CONFIG_CTRL_IFACE_DBUS and CONFIG_CTRL_IFACE_DBUS_NEW

Signed-off-by: Steve Sakoman <steve at sakoman.com>
Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 .../wpa-supplicant/wpa-supplicant-0.7.3/defconfig  |    4 ++--
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc      |   16 ++++++++--------
 recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb     |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig b/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
index 33ee9ea..4136225 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
@@ -343,11 +343,11 @@ CONFIG_PEERKEY=y
 
 # Add support for old DBus control interface
 # (fi.epitest.hostap.WPASupplicant)
-#CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS=y
 
 # Add support for new DBus control interface
 # (fi.w1.hostap.wpa_supplicant1)
-#CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
 
 # Add introspection support for new DBus control interface
 #CONFIG_CTRL_IFACE_DBUS_INTRO=y
diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index 0cf3b70..722f5fa 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -50,14 +50,6 @@ do_install () {
 	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
 	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
 
-	install -d ${D}${sysconfdir}/network/if-pre-up.d/
-	install -d ${D}${sysconfdir}/network/if-post-down.d/
-	install -d ${D}${sysconfdir}/network/if-down.d/
-	install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
-	install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
-	cd ${D}${sysconfdir}/network/ && \
-	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
-
 	if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
 		install -d ${D}/${sysconfdir}/dbus-1/system.d
 		install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
@@ -72,6 +64,14 @@ do_install () {
 		fi
 	fi
 
+	install -d ${D}${sysconfdir}/network/if-pre-up.d/
+	install -d ${D}${sysconfdir}/network/if-post-down.d/
+	install -d ${D}${sysconfdir}/network/if-down.d/
+	install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
+	install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
+	cd ${D}${sysconfdir}/network/ && \
+	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
+
 	install -d ${D}/etc/default/volatiles
 	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 60a4791..05a94eb 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
 require wpa-supplicant-0.7.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
 SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"