summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-03-15 20:07:30 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-08 17:00:06 -0700
commit8a54026a23c81b8818a5aef9e7cdcbef5b1fd157 (patch)
treeac145b45fc7a83eebe899bb4569a412510dfdba0 /meta-oe/recipes-connectivity
parent42a1737960271fbca5756405ec57f64cd17258e8 (diff)
downloadmeta-openembedded-8a54026a23c81b8818a5aef9e7cdcbef5b1fd157.tar.gz
hostapd: fix LICENSE + misc recipe updates
According to the COPYING file in the top level of the hostapd source tree, hostapd was re-licensed from dual BSD/GPLv2 to BSD only in February 2012. This change has apparently gone unnoticed for the past 6 years, but fix it now. Also use pkg-config to find libnl headers (instead of hardcoding), append to base do_configure (instead of over-riding), respect OE's default CFLAGS (instead of ignoring) and make some minor formatting tweaks to bring the recipe more in line with the OE Styleguide. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb39
1 files changed, 20 insertions, 19 deletions
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
index 54c9e7957..4f81d222e 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
@@ -1,18 +1,10 @@
1SUMMARY = "User space daemon for extended IEEE 802.11 management"
1HOMEPAGE = "http://w1.fi/hostapd/" 2HOMEPAGE = "http://w1.fi/hostapd/"
2SECTION = "kernel/userland" 3SECTION = "kernel/userland"
3LICENSE = "GPLv2 | BSD" 4LICENSE = "BSD-3-Clause"
4LIC_FILES_CHKSUM = "file://${B}/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" 5LIC_FILES_CHKSUM = "file://hostapd/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350"
5DEPENDS = "libnl openssl"
6SUMMARY = "User space daemon for extended IEEE 802.11 management"
7
8inherit update-rc.d systemd distro_features_check
9 6
10CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" 7DEPENDS = "libnl openssl"
11
12INITSCRIPT_NAME = "hostapd"
13
14SYSTEMD_SERVICE_${PN} = "hostapd.service"
15SYSTEMD_AUTO_ENABLE_${PN} = "disable"
16 8
17SRC_URI = " \ 9SRC_URI = " \
18 http://w1.fi/releases/hostapd-${PV}.tar.gz \ 10 http://w1.fi/releases/hostapd-${PV}.tar.gz \
@@ -22,16 +14,29 @@ SRC_URI = " \
22 file://key-replay-cve-multiple.patch \ 14 file://key-replay-cve-multiple.patch \
23" 15"
24 16
17SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7"
18SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d"
19
25S = "${WORKDIR}/hostapd-${PV}" 20S = "${WORKDIR}/hostapd-${PV}"
26B = "${WORKDIR}/hostapd-${PV}/hostapd" 21B = "${WORKDIR}/hostapd-${PV}/hostapd"
27 22
28do_configure() { 23inherit update-rc.d systemd pkgconfig distro_features_check
24
25CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers"
26
27INITSCRIPT_NAME = "hostapd"
28
29SYSTEMD_SERVICE_${PN} = "hostapd.service"
30SYSTEMD_AUTO_ENABLE_${PN} = "disable"
31
32do_configure_append() {
29 install -m 0644 ${WORKDIR}/defconfig ${B}/.config 33 install -m 0644 ${WORKDIR}/defconfig ${B}/.config
30} 34}
31 35
32do_compile() { 36do_compile() {
33 export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" 37 export CFLAGS="-MMD -O2 -Wall -g"
34 make 38 export EXTRA_CFLAGS="${CFLAGS}"
39 make V=1
35} 40}
36 41
37do_install() { 42do_install() {
@@ -45,7 +50,3 @@ do_install() {
45} 50}
46 51
47CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" 52CONFFILES_${PN} += "${sysconfdir}/hostapd.conf"
48
49SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7"
50SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d"
51