From 461dc8d6a843b4ccc4923b5ba781574646a87572 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Thu, 24 Jan 2013 18:07:24 +0200 Subject: [PATCH] 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 Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- .../{wpa-supplicant-1.0.inc => wpa-supplicant-2.0.inc} | 8 ++++---- .../99_wpa_supplicant | 0 .../defconfig-gnutls | 0 .../wpa-supplicant.sh | 0 .../wpa_supplicant.conf | 0 .../wpa_supplicant.conf-sane | 0 .../wpa-supplicant/wpa-supplicant_1.0.bb | 6 ------ .../wpa-supplicant/wpa-supplicant_2.0.bb | 6 ++++++ 8 files changed, 10 insertions(+), 10 deletions(-) rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant-1.0.inc => wpa-supplicant-2.0.inc} (92%) rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant-1.0 => wpa-supplicant}/99_wpa_supplicant (100%) rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant-1.0 => wpa-supplicant}/defconfig-gnutls (100%) rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant-1.0 => wpa-supplicant}/wpa-supplicant.sh (100%) rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant-1.0 => wpa-supplicant}/wpa_supplicant.conf (100%) rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant-1.0 => wpa-supplicant}/wpa_supplicant.conf-sane (100%) delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bb diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc similarity index 92% rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc rename to 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)." HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" BUGTRACKER = "http://hostap.epitest.fi/bugz/" SECTION = "network" -LICENSE = "GPLv2 | BSD" -LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://../README;md5=9bee93996fecdb70f807baceb29d84b9 \ - file://wpa_supplicant.c;beginline=1;endline=17;md5=372fb65dc23b228aec4e40e64de3e467" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \ + file://../README;md5=5cb758942d25f6f61fd4ac388fd446fa \ + file://wpa_supplicant.c;beginline=1;endline=12;md5=cba4fa09fa364da845ca546f21008909" DEPENDS = "gnutls dbus libnl" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" 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 similarity index 100% rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/99_wpa_supplicant rename to 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 similarity index 100% rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls rename to 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 similarity index 100% rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa-supplicant.sh rename to 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 similarity index 100% rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf rename to 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 similarity index 100% rename from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/wpa_supplicant.conf-sane rename to 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 @@ -require wpa-supplicant-1.0.inc - -PR = "r3" - -SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640" -SRC_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 @@ +require wpa-supplicant-2.0.inc + +PR = "r0" + +SRC_URI[md5sum] = "3be2ebfdcced52e00eda0afe2889839d" +SRC_URI[sha256sum] = "2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"