From nobody Tue Mar 07 16:13:34 2023 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 4PWL8t6yydz3wKgd; Tue, 7 Mar 2023 16:13:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWL8t6KM0z4Dtt; Tue, 7 Mar 2023 16:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678205614; 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=ejltwX7XpWYgdTyw7U93SuDBzBxM7UYyhhoSQsKkaP0=; b=Xn30nKhiH9ErCqfT6kEsiKi1u9LUET9P8l6Nw3DtR4RHUBC9RwvRryJrS7CQgPhCk9Tmzt 5pGZkmHZSGiMfH4l3vEUHse11eTBV9mNeBi8q9aWniDKlAqPJmnofmZCx4EvvteFkquXcZ Yqaddv+qzjW/Eetp+UKKc+CBokRUUEAr/wxTUasQt9ltrL6TnQTmIqsDUf2lBNGQx/Eeds vms57i7bM0XG1V/uB1jGv2JUvrfSRHv2RfK7wlgZ/r5sFQvkgIV49rSNLhA2yXTgtA9jLc LuDo33tedzgiD4awXuQnBAxJHcoGFq2JJR0EIYxTRvEbEbAI8wQLtu6paQl4OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678205614; 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=ejltwX7XpWYgdTyw7U93SuDBzBxM7UYyhhoSQsKkaP0=; b=MmZ5jQ6JtUyVLVVkk0m0kAOMjzKJ3j/BkvSWP23dIgxnRvfR9dyZ0AKo7FutwlFyJPK617 vVsA/PHiljtJRLs/Epdt0mnUqraPZo6+mTtj43uGQjLU3YTZY0QhFAGcqp+v9y6UWpiz9O ai8hhR2YaD48HnL8SOxluxP5eulZ2f1j/ktvR/KIciMRtvI9Y/3+4FDXMgVIAlKbGwV80U Wfcjifj8wSPskSvD7Yz8da0eOk9xFPbLoSHfh9brfviTpwd3UEBKtCJvN6dhl0JRBPBEH8 KK/iZkF1CrPV2gdWlHSa+iOzIEFGg2nYcI8FPitf9dU1HLKIzTiOKTXBHAD1sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678205614; a=rsa-sha256; cv=none; b=q6x4zMi1bOMsRVWpbnvAOHRAjGWqwfTZgzfEc7O/GoIYikVy30GXj1zrXtjeE//1m8nq1f /fppwEfN6VBal1e6fWp9oB75fHaE4ivbs9YZjJ6av0x98se4bhFq+2d0YlF86kIkihq5FX JZW03ycoPfVqYOSLDeu4yk+VSJ/jA3cGj1IL9IaikEsm6l3HBBwIg0Y6/RXNaD2lDPR0KT M64tjRo+Urvk7lJsr5cs57QeOq7xk3ibOiBkRDukOpdbyMLri/1eOGmPOxN4/1/CjZEiPH Zts34iVIOzJtUzjzZaRT+xo3zju8saqaCviUsM9iYBkRrmYumJiF2GEB74cYBw== 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 4PWL8t5MgSzqr9; Tue, 7 Mar 2023 16:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327GDYGT057216; Tue, 7 Mar 2023 16:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327GDYuO057215; Tue, 7 Mar 2023 16:13:34 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:13:34 GMT Message-Id: <202303071613.327GDYuO057215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cff482380436 - main - bhyve: Move libcasper dependecy to lib9p 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cff4823804363cf199c7c87eed8870ad014066cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cff4823804363cf199c7c87eed8870ad014066cc commit cff4823804363cf199c7c87eed8870ad014066cc Author: Vitaliy Gusev AuthorDate: 2023-03-07 16:09:22 +0000 Commit: Mark Johnston CommitDate: 2023-03-07 16:09:22 +0000 bhyve: Move libcasper dependecy to lib9p libcasper(3) is not used in bhyve. So move dependency to the appropriate place. Reviewed by: markj MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38905 --- lib/lib9p/Makefile | 5 +++-- share/mk/src.libnames.mk | 4 ++++ usr.sbin/bhyve/Makefile | 8 -------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile index c810ccd79e64..5d3681104d8c 100644 --- a/lib/lib9p/Makefile +++ b/lib/lib9p/Makefile @@ -6,8 +6,11 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../contrib/lib9p +LIBADD= sbuf + .if ${MK_CASPER} != "no" CFLAGS+= -DWITH_CASPER +LIBADD+= casper cap_pwd cap_grp .endif LIB= 9p @@ -28,6 +31,4 @@ SRCS= connection.c \ INCSDIR= ${INCLUDEDIR}/lib9p INCS= fid.h lib9p.h backend/fs.h -LIBADD= sbuf - .include diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index dd1bc78b1f1a..15971189306a 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -271,6 +271,10 @@ LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a # 2nd+ order consumers. Auto-generating this would be better. _DP_80211= sbuf bsdxml _DP_9p= sbuf +.if ${MK_CASPER} != "no" +_DP_9p+= casper cap_pwd cap_grp +.endif + # XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a # FreeBSD-specific dependency list .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index bf0a17edc59e..1c679a3c1578 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -89,14 +89,6 @@ SRCS+= vmm_instruction_emul.c LIBADD= vmmapi md nv pthread z util sbuf cam 9p -.if ${MK_CASPER} != "no" -LIBADD+= casper -LIBADD+= cap_pwd -LIBADD+= cap_grp -# Temporary disable capsicum, until we integrate checkpoint code with it. -#CFLAGS+=-DWITH_CASPER -.endif - .if ${MK_BHYVE_SNAPSHOT} != "no" LIBADD+= ucl xo .endif