From nobody Sun Aug 9 07:58:54 2026 X-Original-To: dev-commits-src-all@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 4hHqyk59Gkz6nGV2 for ; Sun, 09 Aug 2026 07:58:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hHqyk3FbSz3db4 for ; Sun, 09 Aug 2026 07:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786262334; 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=LzZdJH+HKbPhx1Pjp1fxROw6M1ejM4xf5zzVCFTZJ6Q=; b=WJ9A0K/iDjs50wbqSLwqMGudRX+pHfs6Bnyi6DnBjQleSYHY5lL3lDGWAFsWK1Lnu5CED6 bAloEKv7+8kQsVOFa+AwJxu01devP9Zs4NYROK7M9gKXeExi522n0sNxIXqnHtbEwzmoqg vVzQkm2S7X67PKDY7Pcmyk24XDcW6qAiqf8E8Ws+2MEvZhaP/bLQRxk1OmhFJtlt+mkNXm Y736pE7VaeDcVweCwFX3H0kcNaHgMBMR7RcJI5MEAv2uQtDPxczYZhdN5lRJCZl1jOwjUw kG55wToq2FhCZSdxwlmtpmpWe5zVjubzg57fP4Cqr9v+H4qSgLMP15aRUAmvCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786262334; a=rsa-sha256; cv=none; b=bFM4RbrseB02SyucsEufhwXMFF/Vipw8v5xJOE/4/C7DdSSZZa3vVpH03c6YB/94RG+/Dm suPItUGXJv5YKl2v23xWobsdQ2drOYt4cWax8ZEbGna8TDEO23Z5WJgiSKRI3dmrbJo8Fo FwJ+K78Rz6uRv49DvzOPzhW+4XmbBSb79nxhahdQUxf8GPWqZdePuF/RqGO8jemULp6dEw nLQh6AtfavSEjjngahXScQzIVBee6waSc28TFWXviULdL1eQ1NMPgZiPRBkdwee80xayfk aNLmLEd/Fc8oNowpdp8FRMwl2rrRK2YNthcKvfqZYNxgHzY+gMu4WMvcuIdzMA== 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=1786262334; 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=LzZdJH+HKbPhx1Pjp1fxROw6M1ejM4xf5zzVCFTZJ6Q=; b=V9sOy/WjhC0p2/Nzn6VWTgjbj37l4sljKr4tSG+X12olLvSwFx5u3oWEIgtN6KT9nlRsQ/ Xt23tM6fcS671yfaJr3qA0EePDBRZ8oHUIstq6ccMXIhBL7v3s3KYij2fKHTi/Q5y1AZdF ONXBV+6ouBX7uXPnyLvOkvrAkxGeoVsEPv+RikRc6RYy3s0G7nmyJyvPA/YSOmhGhLeOtB SPvnEwxvgbSKStGi4dqySXInbO83adWeC8fWRuESJcRCuu3L9T3XEiIpuOvMjiMeAffM1t xZw8v6dv76C+AleZMZwBRgSEXB0g2E+2dwULA0o/seEt2huWMNHjRjZrTQkc/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hHqyk1XLwz3t for ; Sun, 09 Aug 2026 07:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 204f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 09 Aug 2026 07:58:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: fb1820d23a04 - main - rescue: Satisfy libifconfig's libnv dependency in crunched links List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb1820d23a04856a6d3047b4c088cc8df8f76da1 Auto-Submitted: auto-generated Date: Sun, 09 Aug 2026 07:58:54 +0000 Message-Id: <6a78333e.204f3.486aed61@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fb1820d23a04856a6d3047b4c088cc8df8f76da1 commit fb1820d23a04856a6d3047b4c088cc8df8f76da1 Author: Kevin Bowling AuthorDate: 2026-08-09 07:28:17 +0000 Commit: Kevin Bowling CommitDate: 2026-08-09 07:53:12 +0000 rescue: Satisfy libifconfig's libnv dependency in crunched links libifconfig now calls nv(9) routines for the SR-IOV VF status query, so crunched builds that link the static library must also provide libnv. The per-program CRUNCH_LIBS_ifconfig hook cannot do this: crunchgen partially links per-program libraries into the program object and crunchide then localizes every symbol except the stub entry, so members absorbed there cannot satisfy references from another archive on the final link's library list. List libnv globally next to libifconfig.a in rescue(8) and bsdbox. This also makes the existing per-program libnv links redundant; remove them to avoid embedding private localized copies in the crunched binary. Fixes: 2d6114f6d26b ("libifconfig: Add an SR-IOV VF status query") --- rescue/rescue/Makefile | 7 +++---- tools/bsdbox/Makefile | 1 + tools/bsdbox/Makefile.net | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 2ac475cca10c..e65ad75d54af 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -124,7 +124,7 @@ CRUNCH_PROGS_sbin+= ipfw .if ${MK_PF} != "no" CRUNCH_PROGS_sbin+= pfctl -CRUNCH_LIBS_pfctl+= ${LIBPFCTL} ${LIBNV} +CRUNCH_LIBS_pfctl+= ${LIBPFCTL} .endif .if ${MK_ROUTED} != "no" @@ -143,7 +143,7 @@ CRUNCH_PROGS_usr.sbin+= zdb # CRUNCH_PROGS+= devd CRUNCH_LIBS+= -l80211 -lalias -lcam -lncursesw -ldevstat -lipsec -llzma -CRUNCH_LIBS_camcontrol+= ${LIBNVMF} ${LIBNV} +CRUNCH_LIBS_camcontrol+= ${LIBNVMF} .if ${MK_ZFS} != "no" CRUNCH_LIBS+= -lavl -lpthread -lumem -lspl -lrt CRUNCH_LIBS_zfs+= ${LIBBE} \ @@ -261,10 +261,9 @@ CRUNCH_ALIAS_chown= chgrp ################################################################## CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a +CRUNCH_LIBS+= -lnv CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig -CRUNCH_LIBS_ifconfig+= ${LIBNV} - CRUNCH_LIBS+= -lm .if ${MK_ISCSI} != "no" diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index 35e37b31ea2f..ab962c8920c6 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -71,6 +71,7 @@ CRUNCH_SRCDIRS+= sbin CRUNCH_LIBS+= -l80211 -lalias -lcam -lcursesw -ldevstat -lipsec # Don't forget this - ifconfig, etc -adrian CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a +CRUNCH_LIBS+= -lnv CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig diff --git a/tools/bsdbox/Makefile.net b/tools/bsdbox/Makefile.net index d0f7654c41d7..960bc8a25335 100644 --- a/tools/bsdbox/Makefile.net +++ b/tools/bsdbox/Makefile.net @@ -20,7 +20,6 @@ CRUNCH_LIBS+= -lmemstat -lnetgraph # ifconfig CRUNCH_PROGS_sbin+= ifconfig -CRUNCH_LIBS_ifconfig+= ${LIBNV} CRUNCH_SHLIBS+= -l80211 # wlan stuff