mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-11 04:49:58 +00:00
Code Issues Projects Releases Wiki Activity

hostapd: fix LICENSE + misc recipe updates

Browse Source 
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>
This commit is contained in:
Andre McCurdy
2018-03-15 20:07:30 -07:00
committed by Armin Kuster
parent 42a1737960
commit 8a54026a23
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
+20 -19
View File
@@ -1,18 +1,10 @@
SUMMARY = "User space daemon for extended IEEE 802.11 management"
HOMEPAGE = "http://w1.fi/hostapd/" HOMEPAGE = "http://w1.fi/hostapd/"
SECTION = "kernel/userland" SECTION = "kernel/userland"
LICENSE = "GPLv2 | BSD" LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${B}/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350" LIC_FILES_CHKSUM = "file://hostapd/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350"
DEPENDS = "libnl openssl" DEPENDS = "libnl openssl"
SUMMARY = "User space daemon for extended IEEE 802.11 management"
inherit update-rc.d systemd distro_features_check
CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers"
INITSCRIPT_NAME = "hostapd"
SYSTEMD_SERVICE_${PN} = "hostapd.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
SRC_URI = " \ SRC_URI = " \
http://w1.fi/releases/hostapd-${PV}.tar.gz \ http://w1.fi/releases/hostapd-${PV}.tar.gz \
@@ -22,16 +14,29 @@ SRC_URI = " \
file://key-replay-cve-multiple.patch \ file://key-replay-cve-multiple.patch \
" "
SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7"
SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d"
S = "${WORKDIR}/hostapd-${PV}" S = "${WORKDIR}/hostapd-${PV}"
B = "${WORKDIR}/hostapd-${PV}/hostapd" 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 install -m 0644 ${WORKDIR}/defconfig ${B}/.config
} }
do_compile() { do_compile() {
export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" export CFLAGS="-MMD -O2 -Wall -g"
make export EXTRA_CFLAGS="${CFLAGS}"
make V=1
} }
do_install() { do_install() {
@@ -45,7 +50,3 @@ do_install() {
} }
CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" CONFFILES_${PN} += "${sysconfdir}/hostapd.conf"
SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7"
SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d"