From nobody Mon Apr 21 03:45:25 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 4ZgrqV11lnz5sq0X; Mon, 21 Apr 2025 03:45:26 +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 4ZgrqT5jHDz3G65; Mon, 21 Apr 2025 03:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745207125; 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=/GHYttlxRSSFC1Eet0Wba1v59NiuBnuco16J3p+jjCc=; b=Sc957UPwlnjpTQzCLlUKNDtQQJ9bcCFFMmGQPZBB547JfTAphNSLQDYbBBR6LpCB4DjaG5 ZZb6yQeH9PBjS4LxMtjYjqc/5Zabv261y8G0ZiRbwtFTWFADMpYmcYouIPzTo+Xzk1Zbk9 X/5vtRY88KAsUvk8/Zn0Hc51EESM3af43wCwg1w2NFlPtFQY3gg5zIhYhfUQxZdkaq1GD5 1CMV5czVVcvRsVWMdNxCJfuqHBCwJUfPr70goX/35esn2NlY+E+4w8C93NoOglpRthgHGO dUUJHabpZW1n1cIB2mlohy3/8TRHIQ47Jt17TEkg/F9dJ7L4fecHdUpltW85CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745207125; a=rsa-sha256; cv=none; b=Ycxe6AtgdsztLiz4xNGZH24hjbKITDsRad8jVpX/rlUbb/rojH3c3QfYCSESHLFr1JzIR9 ZlRxDrwPu/LA7pzEbkT6sGJQgMonl+B5kbMlRJaUamCgwNKV7Abef5XLEn/ZiSNVJoogro mXwrVVpmwbLLzl76sBOrL2bI64xpxcLsLvTBwCbPfJh+P8B46digfHWQF54MqrVs7SKzCA 3MbTnNGApj8MW7rMIZxBtkBIdWdkiwaEu1oe3hY3zbLxMWhJsfpBI3K8tSTir0C0LP2wbl YJqJZLOWYP4lH+ABa7o1n6QGDUrM/tcvEZLHGD2SWvoOHfz0zHfTYbbW7O9zgQ== 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=1745207125; 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=/GHYttlxRSSFC1Eet0Wba1v59NiuBnuco16J3p+jjCc=; b=QwE85ExQIi8K8Yt7ehk7Ti17KQ1RPXFDDdhHsZoyTOZ2W/fu7SEoiuoblZM4Zgrj6C3HO2 Lc56SCcNTO7Y7Ir4E4H08jGk5QEVxFWyLV67Ulwl3UKA2XMuohM1XZN4YztlPEeMqwYZeL fhrbdUdVFt8EPpg4XnjvAIshCO6rGbc0zZUwlmjvPQaLoW1agmN17+Ka0inKnjqGiEXyeX om4ybGovbidVnvSyPow0vyDAX9ATQJyo5J8XH10a0lLyeUNc0aTOjKmp3Upjp+nacOIEIb 9vsSjkaqBndrZz7R9RUJ/zZt3fbVQwyIu8j7hVtkr4ntBS1T/tRl4KcZzTJn1A== 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 4ZgrqT4sS0zZNf; Mon, 21 Apr 2025 03:45:25 +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 53L3jPvs060915; Mon, 21 Apr 2025 03:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L3jP5v060912; Mon, 21 Apr 2025 03:45:25 GMT (envelope-from git) Date: Mon, 21 Apr 2025 03:45:25 GMT Message-Id: <202504210345.53L3jP5v060912@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: 47404d1d98ac - main - bsdbox: fix the build 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: 47404d1d98ac1e0fdba1ae33e41838ff4c450d2b Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=47404d1d98ac1e0fdba1ae33e41838ff4c450d2b commit 47404d1d98ac1e0fdba1ae33e41838ff4c450d2b Author: Kyle Evans AuthorDate: 2025-04-21 03:44:52 +0000 Commit: Kyle Evans CommitDate: 2025-04-21 03:45:00 +0000 bsdbox: fix the build hostapd is removed for now because it's a little less trivial with recent wpa architecture. The rest is adopting to ncurses and ifconfig changes, as well as a switch in PIE default. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42498 --- tools/bsdbox/Makefile | 7 ++++--- tools/bsdbox/Makefile.base | 3 +++ tools/bsdbox/Makefile.net | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index a164ddf54cbd..37d6318ccbb3 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -2,6 +2,7 @@ MAN= .include MK_SSP= no +MK_PIE= no PROG= bsdbox BINDIR?=/sbin @@ -52,7 +53,7 @@ CRUNCH_SRCDIRS+= bin # setuid binaries - they use these libraries. PAM needs to be # built dynamically or it tries to build _all_ of the modules # statically - and that ends very badly. -CRUNCH_SHLIBS+= -lc -lutil -lcrypt -lxo -lgpio +CRUNCH_SHLIBS+= -lc -lsys -lutil -lcrypt -lxo -lgpio CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph CRUNCH_LIBS+= -lcrypt -ledit -ltermcapw @@ -69,7 +70,7 @@ CRUNCH_SRCDIRS+= sbin CRUNCH_LIBS+= -l80211 -lalias -lcam -lcursesw -ldevstat -lipsec # Don't forget this - ifconfig, etc -adrian -CRUNCH_LIBS+= ${LDADD_ifconfig} +CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig @@ -93,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.base b/tools/bsdbox/Makefile.base index 49f31b421098..8dfc2c50c68c 100644 --- a/tools/bsdbox/Makefile.base +++ b/tools/bsdbox/Makefile.base @@ -9,6 +9,8 @@ CRUNCH_PROGS_bin+= ln rm kenv mv expr CRUNCH_PROGS_usr.bin+= true false hexdump tail nc w head uname tset CRUNCH_PROGS_usr.sbin+= gpioctl CRUNCH_ALIAS_w= uptime + +CRUNCH_SRCDIR_tset= ${SRCTOP}/usr.bin/ncurses CRUNCH_ALIAS_tset= reset CRUNCH_PROGS_usr.bin+= vmstat @@ -23,6 +25,7 @@ CRUNCH_LIBS+= -lprivatezstd -lthr # Clear requires tput, and it's a shell script so it won't be crunched CRUNCH_PROGS_usr.bin+= tput +CRUNCH_SRCDIR_tput= ${SRCTOP}/usr.bin/ncurses # sh CRUNCH_PROGS_bin+= sh diff --git a/tools/bsdbox/Makefile.net b/tools/bsdbox/Makefile.net index 960bc8a25335..d0f7654c41d7 100644 --- a/tools/bsdbox/Makefile.net +++ b/tools/bsdbox/Makefile.net @@ -20,6 +20,7 @@ CRUNCH_LIBS+= -lmemstat -lnetgraph # ifconfig CRUNCH_PROGS_sbin+= ifconfig +CRUNCH_LIBS_ifconfig+= ${LIBNV} CRUNCH_SHLIBS+= -l80211 # wlan stuff