From nobody Mon Feb 12 22:59:32 2024 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 4TYfzT0C2zz597YK; Mon, 12 Feb 2024 22:59:33 +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 4TYfzS2sSXz4Tvh; Mon, 12 Feb 2024 22:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707778772; 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=vCf7TIal/iFsOLggd0SCknzTcwtjK9JFHv0s513Iwug=; b=vxb+Doa8+n1Wmf3+ZQxoP05W4o2fmM89Wuwk/dFPKcvqNREFqWRGPFCdLpYtXxoVdr40I/ lg2RKuA9hY7+qsP3NkzAsGlbZawEctQgRu7NilKJ63+LSUd4U3rFeBocx+fRbNw9btT31+ r7eVxnl7lXaTdYI2F216mmvLxI41YI/30jnspukKfzJBU7DnK2HjPUXa+1/XO2/CeCWCh3 nC5fjmfDzxubrkE1zzSJ7MAm6nMmfBEwy21L5SG0htQAgnLqF45ypjF6XNCy36wfPVPvCJ 75Ay8hANNNT2cRf2j4Zjn56wJGR3RRmk+AYKfk4eneNcXXkO+w1C+OKSvtAELg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707778772; a=rsa-sha256; cv=none; b=AgryVX7NZjnxZFZE9G9KqBfXExYhjxeAVmR1nLzouCjIWie68uPZJzGtoN9fNer8MH1qbH w4AKBOB5xvADe32oBYcoP1gIXwvrp4rdaII+ayRsM6/8yoxql3PNEn7q8c9xZN4/8C1Pfp eR2i1x4sSQxCDHkycpRR1oW9BzGQZH36crj/6OlX33YHGOrdhFCm97aekOEiuF9Tvo0JMm up9rjotNUoli3E152k68lZOnYo7MuQlzxwmdwYf1gNaWLVwZpuVWdBAPwRvulyWEw6rufn 6wtgLhPJVTnRIKZSfjIu7FbcL8Miv/ek8MVO7RgTNG59NZ8lnsUxSNMIR2B9/A== 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=1707778772; 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=vCf7TIal/iFsOLggd0SCknzTcwtjK9JFHv0s513Iwug=; b=OkHkwB59qJP3VB3RHalTxUSG/FwuXQlorte4nFhkuFvBOcYM+ld2h+gWQjUcYd3Cfv22ap XKdUA2uHGUs2DlP77HvTMA8G6C5XkSQqd8Vg38LN01T6BSr06yX3BNWTR+v8Ue23sVxBci kbaD7P987dDx5qritsa6bGTR823nyv2XBkWC+0Rxx4DeNWCK2Y2TNvPGWnvr5NSoUMB68+ si3xc0L7HsFT6g655mq/Icl48nhyOJC5TgV7MPBTlbCf+Mn7NcEYc6xM1RsujgrfrQTBBP WK5a/r5A966F/vsU2jmJvkWnfbat1rwUguZX5QVMnCs40kOo3VYS6yuYHHdUUQ== 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 4TYfzS1zRGzr5w; Mon, 12 Feb 2024 22:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CMxWae035176; Mon, 12 Feb 2024 22:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CMxWAJ035173; Mon, 12 Feb 2024 22:59:32 GMT (envelope-from git) Date: Mon, 12 Feb 2024 22:59:32 GMT Message-Id: <202402122259.41CMxWAJ035173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bd45bbe440f1 - main - rescue: Fix after zfsbootcfg addition 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd45bbe440f19eeb166a13798c8dcc4dfeb29e36 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd45bbe440f19eeb166a13798c8dcc4dfeb29e36 commit bd45bbe440f19eeb166a13798c8dcc4dfeb29e36 Author: Warner Losh AuthorDate: 2024-02-12 22:10:37 +0000 Commit: Warner Losh CommitDate: 2024-02-12 22:59:14 +0000 rescue: Fix after zfsbootcfg addition Get the library dependencies correct for zfsbootcfg. libzfsbootcfg depends on a all of these... Fixes: ac4847e6b0e9 Sponsored by: Netflix --- rescue/rescue/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 4c351e632638..5d5c609eb218 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -148,7 +148,13 @@ CRUNCH_LIBS_zfs+= ${LIBBE} \ CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} ${LIBZDB} -CRUNCH_LIBS_zfsbootcfg+=${LIBZFSBOOTENV} +CRUNCH_LIBS_zfsbootcfg+=${LIBZFSBOOTENV} \ + ${LIBZPOOL} \ + ${LIBZFS} \ + ${LIBZUTIL} \ + ${LIBZFS_CORE} \ + ${LIBICP_RESCUE} \ + ${LIBNVPAIR} .else # liblzma needs pthread CRUNCH_LIBS+= -lpthread