From nobody Mon Apr 21 03:45:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZgrqW3YDMz5spwV; Mon, 21 Apr 2025 03:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgrqV6R4Fz3GRt; Mon, 21 Apr 2025 03:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745207126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lkGHH9Yabx4+4fgc88qU55XcEBYUQurYKUW6BkKnh6Y=; b=ZilxLnrlgeW7kWKNZy5pnPfpWLzRvBnOfxCTKkznGc4dyOazBUgMQggZldYSSym5eTuJKP JYgCTKAWMyjqwvtNCj0DBRfKrnZGW6s82fIxGmw0PgjQTgLDS1Atq6ZprvEWMoGBO0N6S9 z5OD1U0bK7gpcEc5wcbHz6vqFttsFOJ0GNi7f/hyi+nQbpQRJQUKZgLE3WAgSi+/iE196v t+wCURLVM0BcO58LZSfXK6Qf4ypkNDmCRF1iTYNGiiy9qvVnLyJPBXA3nbs0ur/xxjYLCQ PrAwZYjOVHKpI4YwEbpI4FQgPoSpeSnwjvG5gIhzUfszQgaVYjWXQrxYpH6H1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745207126; a=rsa-sha256; cv=none; b=Xx43PRApVrTychnw6FRK2v+UgBLcSD2pmw273rqwPoy+3QXIsbCqHWHf4qugGkifeKb62n fjkCNGUOF6hwf9/HJls+O7oKKfyor6mOrKguOKrDBlNJ2PcWc/YQinuq3nz1lRRM6Vexnt fcIzIk8tS9/HbtNXugHGswicWoH5ojHERyADTHMQPMppFMBj4yVBuFaPhDr6boCJqgDmCy gOn3HJd9YAQst49/Z0qls7Ri+5QV4442hlWa/UyneelX93k99unifm2nXUGmXeZ+MiDe2Q LEKGHoLdSYxzXTL8bsxPqZelmLbn3rq2hSRKpZaD6Yj3/b7jIxx0bWf5e7cC2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745207126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lkGHH9Yabx4+4fgc88qU55XcEBYUQurYKUW6BkKnh6Y=; b=vrE8BJWI00PaHDM3bOejePDBu36Zp4ej0NI64q2/DLMaSivcvmkP8/bZFDTxqUYZLHxb5O 12OzRgRH2WraYJ6pQOq6jxuXEMvkrZCQhw0Qk6ofu1vdgekuWqHoD6GgVSQU39WKl/Cs5a GXkOo44/Tgx/XuIhWqyfNauC5KRPBfb4ducavlCv1MfK0VRjiF02aXOdD0WAPiCcq4D5AK 6vGgCWoI32Mw6ioYUBrGM6ZBIrRVx+CA4gizgW5ib4Xg8QCTJaPV7/ZdQn0N3joTkCxLOA wumDg2JUT3Eo4dw1eoRCsCNBD2QYub1YUsUqM5PmunYLABJueQ7BxSAplgdfIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZgrqV62ggzZ8L; Mon, 21 Apr 2025 03:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53L3jQ8d060949; Mon, 21 Apr 2025 03:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L3jQUO060946; Mon, 21 Apr 2025 03:45:26 GMT (envelope-from git) Date: Mon, 21 Apr 2025 03:45:26 GMT Message-Id: <202504210345.53L3jQUO060946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 25a9b4159e33 - main - bsdbox: fix the hostapd build, hook it back up List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25a9b4159e33fb6024a4f832ce7d280481aca6b2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=25a9b4159e33fb6024a4f832ce7d280481aca6b2 commit 25a9b4159e33fb6024a4f832ce7d280481aca6b2 Author: Kyle Evans AuthorDate: 2025-04-21 03:44:53 +0000 Commit: Kyle Evans CommitDate: 2025-04-21 03:45:01 +0000 bsdbox: fix the hostapd build, hook it back up WPA stuff is now structured a little bit differently and requires a number of other libs now, so pull those in. It also needs to be able to keep wpa_driver_bsd_ops exposed as part of the lib/program contract. Reviewed by: adrian, imp Differential Revision: https://reviews.freebsd.org/D42500 --- tools/bsdbox/Makefile | 2 +- tools/bsdbox/Makefile.hostapd | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index 37d6318ccbb3..35e37b31ea2f 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -94,7 +94,7 @@ CRUNCH_LIBS+= -lm .include "Makefile.base" .include "Makefile.net" -#.include "Makefile.hostapd" +.include "Makefile.hostapd" #.include "Makefile.textproc" .include "Makefile.login" .include "Makefile.kld" diff --git a/tools/bsdbox/Makefile.hostapd b/tools/bsdbox/Makefile.hostapd index 8c5d86d86704..95c6a7f7f45b 100644 --- a/tools/bsdbox/Makefile.hostapd +++ b/tools/bsdbox/Makefile.hostapd @@ -7,6 +7,8 @@ CRUNCH_PROGS_usr.sbin+= hostapd hostapd_cli CRUNCH_SRCDIR_hostapd= $(.CURDIR)/../../usr.sbin/wpa/hostapd CRUNCH_SRCDIR_hostapd_cli= $(.CURDIR)/../../usr.sbin/wpa/hostapd_cli +CRUNCH_KEEP_hostapd+= wpa_driver_bsd_ops + #CRUNCH_PROGS_usr.sbin+= wpa_supplicant wpa_cli #CRUNCH_SRCDIR_wpa_supplicant= $(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant #CRUNCH_SRCDIR_wpa_cli= $(.CURDIR)/../../usr.sbin/wpa/wpa_cli @@ -17,3 +19,10 @@ CRUNCH_LIBS+= -lmlx5 -libverbs .endif CRUNCH_LIBS+= -lpcap +wpalibs= drivers ap l2_packet eap_server +wpalibs+= eapol_auth eap_common +wpalibs+= radius tls wps common crypto utils + +.for wpalib in ${wpalibs} +CRUNCH_LIBS+= ${LIBWPA${wpalib:tu}} +.endfor