summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-03-08 23:42:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-12 18:33:28 +0000
commit39ae5b59c10ace0f6705e031f4fe235201914a38 (patch)
tree9eb1c810f49f00a3b784264e67222949f70ae01b /meta/recipes-connectivity
parentf6cc25ce1214e7e52769c3ffba118cf2af3b42ca (diff)
downloadpoky-39ae5b59c10ace0f6705e031f4fe235201914a38.tar.gz
wpa-supplicant: change S to point to the top-level directory
This makes it possible to apply patches to ../src. (From OE-Core rev: 48dbcc8c45d165e67f58a8307dde7594a28cf9bd) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc26
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index 75e85ae646..9e4514affb 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -3,9 +3,9 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
3BUGTRACKER = "http://hostap.epitest.fi/bugz/" 3BUGTRACKER = "http://hostap.epitest.fi/bugz/"
4SECTION = "network" 4SECTION = "network"
5LICENSE = "BSD" 5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
7 file://../README;md5=5cb758942d25f6f61fd4ac388fd446fa \ 7 file://README;md5=5cb758942d25f6f61fd4ac388fd446fa \
8 file://wpa_supplicant.c;beginline=1;endline=12;md5=cba4fa09fa364da845ca546f21008909" 8 file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=cba4fa09fa364da845ca546f21008909"
9DEPENDS = "gnutls dbus libnl" 9DEPENDS = "gnutls dbus libnl"
10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" 10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
11 11
@@ -21,7 +21,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
21 file://wpa_supplicant.conf-sane \ 21 file://wpa_supplicant.conf-sane \
22 file://99_wpa_supplicant" 22 file://99_wpa_supplicant"
23 23
24S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant" 24S = "${WORKDIR}/wpa_supplicant-${PV}"
25 25
26PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " 26PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
27FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" 27FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
@@ -31,7 +31,7 @@ CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
31 31
32do_configure () { 32do_configure () {
33 echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> ${WORKDIR}/defconfig-gnutls 33 echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> ${WORKDIR}/defconfig-gnutls
34 install -m 0755 ${WORKDIR}/defconfig-gnutls .config 34 install -m 0755 ${WORKDIR}/defconfig-gnutls wpa_supplicant/.config
35} 35}
36 36
37export EXTRA_CFLAGS = "${CFLAGS}" 37export EXTRA_CFLAGS = "${CFLAGS}"
@@ -39,19 +39,19 @@ export BINDIR = "${sbindir}"
39 39
40do_compile () { 40do_compile () {
41 unset CFLAGS CPPFLAGS CXXFLAGS 41 unset CFLAGS CPPFLAGS CXXFLAGS
42 oe_runmake 42 oe_runmake -C wpa_supplicant
43} 43}
44 44
45do_install () { 45do_install () {
46 install -d ${D}${sbindir} 46 install -d ${D}${sbindir}
47 install -m 755 wpa_supplicant ${D}${sbindir} 47 install -m 755 wpa_supplicant/wpa_supplicant ${D}${sbindir}
48 install -m 755 wpa_cli ${D}${sbindir} 48 install -m 755 wpa_supplicant/wpa_cli ${D}${sbindir}
49 49
50 install -d ${D}${bindir} 50 install -d ${D}${bindir}
51 install -m 755 wpa_passphrase ${D}${bindir} 51 install -m 755 wpa_supplicant/wpa_passphrase ${D}${bindir}
52 52
53 install -d ${D}${docdir}/wpa_supplicant 53 install -d ${D}${docdir}/wpa_supplicant
54 install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant 54 install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
55 55
56 install -d ${D}${sysconfdir} 56 install -d ${D}${sysconfdir}
57 install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf 57 install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
@@ -64,13 +64,13 @@ do_install () {
64 ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant 64 ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
65 65
66 install -d ${D}/${sysconfdir}/dbus-1/system.d 66 install -d ${D}/${sysconfdir}/dbus-1/system.d
67 install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d 67 install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
68 install -d ${D}/${datadir}/dbus-1/system-services 68 install -d ${D}/${datadir}/dbus-1/system-services
69 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services 69 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
70 70
71 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 71 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
72 install -d ${D}/${systemd_unitdir}/system 72 install -d ${D}/${systemd_unitdir}/system
73 install -m 644 ${S}/systemd/*.service ${D}/${systemd_unitdir}/system 73 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
74 fi 74 fi
75 75
76 install -d ${D}/etc/default/volatiles 76 install -d ${D}/etc/default/volatiles