diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-03-15 20:07:30 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | 8a54026a23c81b8818a5aef9e7cdcbef5b1fd157 (patch) | |
tree | ac145b45fc7a83eebe899bb4569a412510dfdba0 | |
parent | 42a1737960271fbca5756405ec57f64cd17258e8 (diff) | |
download | meta-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>
-rw-r--r-- | meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb | 39 |
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 54c9e7957f..4f81d222ee 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 @@ +SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" -LICENSE = "GPLv2 | BSD" -LIC_FILES_CHKSUM = "file://${B}/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" -DEPENDS = "libnl openssl" -SUMMARY = "User space daemon for extended IEEE 802.11 management" - -inherit update-rc.d systemd distro_features_check +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://hostapd/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" -CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" - -INITSCRIPT_NAME = "hostapd" - -SYSTEMD_SERVICE_${PN} = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +DEPENDS = "libnl openssl" SRC_URI = " \ http://w1.fi/releases/hostapd-${PV}.tar.gz \ @@ -22,16 +14,29 @@ SRC_URI = " \ file://key-replay-cve-multiple.patch \ " +SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" +SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" + S = "${WORKDIR}/hostapd-${PV}" B = "${WORKDIR}/hostapd-${PV}/hostapd" -do_configure() { +inherit update-rc.d systemd pkgconfig distro_features_check + +CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" + +INITSCRIPT_NAME = "hostapd" + +SYSTEMD_SERVICE_${PN} = "hostapd.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +do_configure_append() { install -m 0644 ${WORKDIR}/defconfig ${B}/.config } do_compile() { - export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" - make + export CFLAGS="-MMD -O2 -Wall -g" + export EXTRA_CFLAGS="${CFLAGS}" + make V=1 } do_install() { @@ -45,7 +50,3 @@ do_install() { } CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" - -SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" -SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" - |