From nobody Sun Jul 24 22:55:29 2022 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 4Lrdmx45qlz3yvJ4; Sun, 24 Jul 2022 22:55:29 +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 4Lrdmx2SGWz40mk; Sun, 24 Jul 2022 22:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703329; 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=H2pVfxfuFGFRoEaSZVM+BGgwG2/O8/YwO06dLPqiFXE=; b=SskzhZcBgnMlf4KksntHEFv61ETyxPW3IqOHR1NV5hbudF8kUKnAbsYFfz87yCR4OlFPEf gsmgW9mWt0FSkE4ojn/wDg6ix2PgkM8bmtzkhK7ueinZnhB6wa2gsH93++bbthD8/OlJHU BsaWalje2nz8wv9HSpKvv6MUARRh4Ga/lRabekwbM9vICsmL5SzCKCXeLN9CNvZbUjaYLQ y9f3o1yx7Lv/QZzNy6hTH3pXfnR3fVaQwCvVc1ljhEUvlbCMAf7yCV6qsHIRnBZWRMN8UY GkMkhLZizE/Hok2S9+4TNT8SqfJKzmMimJjVIcFqw4t07uHlctAhaUQX4sCp/A== 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 4Lrdmx1XL3zb9P; Sun, 24 Jul 2022 22:55:29 +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 26OMtT01004271; Sun, 24 Jul 2022 22:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OMtTmM004270; Sun, 24 Jul 2022 22:55:29 GMT (envelope-from git) Date: Sun, 24 Jul 2022 22:55:29 GMT Message-Id: <202207242255.26OMtTmM004270@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: 08585e779939 - main - tools/boot: Fix universe.sh's ZFS exclusion test 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08585e779939cbb0fa932b15678090a58c5ef679 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703329; 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=H2pVfxfuFGFRoEaSZVM+BGgwG2/O8/YwO06dLPqiFXE=; b=TS8woxF4W2arCjGN7tVOdr5RI8+6U8iiQIOfUJU7vsd0oWYXnbtlCK/Z+SKtaXqIVclEt6 72N6AJqLB+gM4ZAbTxjKvl6XstCOFBPqlLeBoxXTdbxmUtNk3DkUNvQQxaUiLXDhBFO2e+ s2EqPvcqzrE+BrEDquB1cgt+C3LEXUfjl2mv9MfhANW26TVst9B+VBalKb0yqAOuM3LaI+ Iu1/4VRajFmWaSp7ZDli36dqE5WT33BnMbnKrBEK6NPaKRoag9A4NtbbqlhAd3ZVq2snxs 88pRnwB8wTxK6xi1ntFo4DywvGoCQEmwjiuLJhx6HnnP1CZmajAvdoWh5zYdOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658703329; a=rsa-sha256; cv=none; b=H3txsKnxMXaOuxneOY28yTcXdng4PqFPe4QM1ZHh+altV4fwSJExs3VXVmehyu3qSUaWlX S63FByZJAWWuTA6tFT3JaZfcyxQLBrLm8D+VHwQT7E/bcqw+Ch7IPgjsLqCtxEdfj2P+Mi E2x2JfttcNqq41yzbFK0cUMnfqi3aFpDsHPKngFzVt3NjSWgvTqQTadYfXukDIbnm+iX53 0ctkytj4xQVuAHPzvJ2Fix54WUY+W5uRmU26aJ3B0l28RzgjQF2EaOdA6bM6DJrJ0ubQ0q yBspNNo5BAb3MEA41ZCymUaPlLxBC0AkR3Z827ouhF7bIRPksU5ExSjc0zAACQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=08585e779939cbb0fa932b15678090a58c5ef679 commit 08585e779939cbb0fa932b15678090a58c5ef679 Author: Warner Losh AuthorDate: 2022-07-24 21:51:06 +0000 Commit: Warner Losh CommitDate: 2022-07-24 22:53:34 +0000 tools/boot: Fix universe.sh's ZFS exclusion test MK_LOADER_ZFS is the current spelling of enabling or disabling ZFS builds. Use it instead of MK_ZFS. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D35896 --- tools/boot/universe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index 13d707750b86..6fcb496baf8c 100755 --- a/tools/boot/universe.sh +++ b/tools/boot/universe.sh @@ -94,7 +94,7 @@ for i in \ i386/i386 \ ; do ta=${i##*/} - dobuild $ta _.boot.${ta}.no_zfs.log "MK_ZFS=no" + dobuild $ta _.boot.${ta}.no_zfs.log "MK_LOADER_ZFS=no" done # Build with firewire