summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-01-24 18:07:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 14:36:15 +0000
commit461dc8d6a843b4ccc4923b5ba781574646a87572 (patch)
tree8ec6f766062606eab3f07da74248a4ef0064ba69
parentbbd280b491400d3fdf075ba65348be6d334ed230 (diff)
downloadpoky-461dc8d6a843b4ccc4923b5ba781574646a87572.tar.gz
wpa-supplicant: upgrade to 2.0
- as of February 11, 2012, the project has chosen to use only the BSD license option for future distribution - wpa-supplicant-1.0 dir was not version specific, as such it is generic now (From OE-Core rev: 0f83cb8ca629fbf1af448781f28912bbc75e0d80) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc)8
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/99_wpa_supplicant)0
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls)0
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa-supplicant.sh)0
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf)0
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane (renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf-sane)0
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb6
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb6
8 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index 0645193803..89910a0589 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -2,10 +2,10 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
2HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" 2HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
3BUGTRACKER = "http://hostap.epitest.fi/bugz/" 3BUGTRACKER = "http://hostap.epitest.fi/bugz/"
4SECTION = "network" 4SECTION = "network"
5LICENSE = "GPLv2 | BSD" 5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ 6LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
7 file://../README;md5=9bee93996fecdb70f807baceb29d84b9 \ 7 file://../README;md5=5cb758942d25f6f61fd4ac388fd446fa \
8 file://wpa_supplicant.c;beginline=1;endline=17;md5=372fb65dc23b228aec4e40e64de3e467" 8 file://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
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/99_wpa_supplicant b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
index 6ff4dd8826..6ff4dd8826 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/99_wpa_supplicant
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
index e041b4d36f..e041b4d36f 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig-gnutls
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa-supplicant.sh b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
index 5c9e5d33a7..5c9e5d33a7 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa-supplicant.sh
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
index 68258f5ee2..68258f5ee2 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf-sane b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
index c91ffe0c84..c91ffe0c84 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf-sane
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
deleted file mode 100644
index 115007563e..0000000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require wpa-supplicant-1.0.inc
2
3PR = "r3"
4
5SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
6SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
new file mode 100644
index 0000000000..22e42dd3f9
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb
@@ -0,0 +1,6 @@
1require wpa-supplicant-2.0.inc
2
3PR = "r0"
4
5SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d"
6SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"