summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/wpa-supplicant
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-05-24 16:09:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:54 +0100
commit277f18eeb2e75ed55ce8ede36245b5a4fbe83d97 (patch)
treeee0a619ac7127339b43f27284b7300378236ed13 /meta/recipes-connectivity/wpa-supplicant
parent45e6085ed947dbd1f17661a71c0f420966483f50 (diff)
downloadpoky-277f18eeb2e75ed55ce8ede36245b5a4fbe83d97.tar.gz
wpa-supplicant: add wpa_supplicant.conf to CONFFILES and don't install it twice
* first we install ${WORKDIR}/wpa_supplicant.conf-sane install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf and a bit later in do_install we were overwritting it with ${WORKDIR}/wpa_supplicant.conf install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} * notice that this patch also changes .conf permissions from 644 back to 600 (From OE-Core rev: 583fdb62c73851b439bdf0c8e50f74073e566d5a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc2
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index b4898930b5..efd1a66f60 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -22,6 +22,7 @@ PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
22FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" 22FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
23FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" 23FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
24FILES_${PN} += "${datadir}/dbus-1/system-services/*" 24FILES_${PN} += "${datadir}/dbus-1/system-services/*"
25CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
25 26
26do_configure () { 27do_configure () {
27 install -m 0755 ${WORKDIR}/defconfig-gnutls .config 28 install -m 0755 ${WORKDIR}/defconfig-gnutls .config
@@ -50,7 +51,6 @@ do_install () {
50 install -d ${D}${sysconfdir}/network/if-pre-up.d/ 51 install -d ${D}${sysconfdir}/network/if-pre-up.d/
51 install -d ${D}${sysconfdir}/network/if-post-down.d/ 52 install -d ${D}${sysconfdir}/network/if-post-down.d/
52 install -d ${D}${sysconfdir}/network/if-down.d/ 53 install -d ${D}${sysconfdir}/network/if-down.d/
53 install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
54 install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant 54 install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
55 cd ${D}${sysconfdir}/network/ && \ 55 cd ${D}${sysconfdir}/network/ && \
56 ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant 56 ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 1e0086a22b..7bbb8c08ea 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
1require wpa-supplicant-0.7.inc 1require wpa-supplicant-0.7.inc
2 2
3PR = "r10" 3PR = "r11"
4 4
5SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" 5SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
6SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443" 6SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"