From ad437d52372e6a5aa3631434a79d9a8605ee7ba9 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 30 May 2024 01:13:47 +0200 Subject: hostapd: Support running "devtool modify hostapd" For "devtool modify" to work correctly, ${B} needs to match ${S}. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'meta-oe/recipes-connectivity/hostapd') diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb index e547462bb..6eca853e4 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb @@ -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 ${UNPACKDIR}/defconfig ${B}/.config + install -m 0644 ${UNPACKDIR}/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 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hostapd install -m 0644 ${UNPACKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service -- cgit v1.2.3-54-g00ecf