Backport of three patches from master
cover Backport of three patches from master
Peter Kjellerstedt (3):
hostapd: Support running "devtool modify hostapd"
hostapd: Only include the relevant parts from README in
LIC_FILES_CHKSUM
libjs-jquery-icheck: Correct LIC_FILES_CHKSUM
.../recipes-connectivity/hostapd/hostapd_2.10.bb | 15 ++++++--------- .../libjs/libjs-jquery-icheck_1.0.3.bb | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-)
PATCH 1/3 hostapd: Support running "devtool modify hostapd"
For "devtool modify" to work correctly, ${B} needs to match ${S}.
--- .../recipes-connectivity/hostapd/hostapd_2.10.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +5 -8
@@ -16,9 +16,6 @@ SRC_URI = " \ SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" -S = "${WORKDIR}/hostapd-${PV}" -B = "${WORKDIR}/hostapd-${PV}/hostapd" - inherit update-rc.d systemd pkgconfig features_check CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers"
@@ -29,20 +26,20 @@ 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}/hostapd/.config } do_compile() { export CFLAGS="-MMD -O2 -Wall -g" export EXTRA_CFLAGS="${CFLAGS}" - make V=1 + make -C hostapd V=1 } do_install() { install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ - install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir} - install -m 0755 ${B}/hostapd ${D}${sbindir} - install -m 0755 ${B}/hostapd_cli ${D}${sbindir} + install -m 0644 ${B}/hostapd/hostapd.conf ${D}${sysconfdir} + install -m 0755 ${B}/hostapd/hostapd ${D}${sbindir} + install -m 0755 ${B}/hostapd/hostapd_cli ${D}${sbindir} install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service
PATCH 2/3 hostapd: Only include the relevant parts from README in LIC_FILES_CHKSUM
In reply to Peter KjellerstedtOnly include the lines from the README that cover the copyright and the license text.
License-Update: Only include the relevant parts of the README
--- meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +1 -1
@@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172" +LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=aa03b8bd6216d1a7ca01fd4b89863073" DEPENDS = "libnl openssl"
PATCH 3/3 libjs-jquery-icheck: Correct LIC_FILES_CHKSUM
In reply to Peter KjellerstedtOnly include the lines from icheck.js that cover the copyright and the license text.
License-Update: Only include the relevant parts of icheck.js
--- meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb +1 -1
@@ -3,7 +3,7 @@ SECTION = "console/network" HOMEPAGE = "http://fronteed.com/iCheck" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://icheck.js;start_line=1;end_line=8;md5=404078d7de9f05ed64d364274f790055" +LIC_FILES_CHKSUM = "file://icheck.js;beginline=6;endline=7;md5=ea25eee37fc3b14403e215bfe13564bc" SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}"