From nobody Thu Mar 02 17:10:19 2023 X-Original-To: dev-commits-src-branches@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 4PSHfg5mLHz3w375; Thu, 2 Mar 2023 17:10:19 +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 4PSHfg4tbcz3BsY; Thu, 2 Mar 2023 17:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777019; 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=0v6AOUt6x2q+nSEWiMaUUti/tjNIkBxOneMoeRJqyU4=; b=CstmiHS3qOJg6+KrMZXjXSrkTUEl5dxMhXQBd2WoySwH4fdQeR+6kmrScatz0E8mTjfbgp 2yTNVIuLVowXzxrxbTTxHopngcnJdNVkkBtc8o8vmx5PUFHHN+kqj7L/Ux//FQF3QsNCMH 79qUJ7Fe0TyRwZuenoN3skzEWFw1jimwh2NOF6ChEmc2/1F77VbzmAmzl8LQm5BtXT68M6 FSIK274gE0bcxlmJpcD9/RZRQQOrukmFytSWTelkq4mGssw+5KnC8mG94woXV9gb4jx6gT EVraaa13levQz0q5bcOlBiA0KTrElCIcxblt4QxYSxR0gMeAraCv+j8jG1ezvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677777019; 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=0v6AOUt6x2q+nSEWiMaUUti/tjNIkBxOneMoeRJqyU4=; b=Q8cXQqvLj+lwwuCSkQ5AfkdaiUtL58CpuWmfPJurt+BDzpX3yoMBdRdwuYPVb6fze3T08j K/thOeFcF6JekVnq1J+4zrKmp88to79XRDm6o2tY850eTkevirCN6E94vjsxG6jh3F5cPS pgXjwLOZbnhoWC7oCXWuk0nckTrZ2zV5ObXBTLksHs3XLb9V0VnQv0EjCUitTIYMLkmhKB kqshwT8XtD3tU+5L/qWX2PVoVgpXirCWVkg28H4QA3h4IXoJEPNKln4O+ATGmDkqcuD1YD CQB3+tycbAzj2rs8nojwOEXDzPH1wf/xGGooKn+/4WUVeelgnUDUgNnMUByzNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677777019; a=rsa-sha256; cv=none; b=yVxhu5q5f/SXBGo3fArqNFradtTong7ciHRTAc5OYpiooDoFXb7IELq0EXXkAuAPxyO7H4 ojnwux8jct1Fs0YdORB0UBrd6yQjKiPb5eIJre5QQl7RLCCdnUpk60JzoEuqxKTPaJIlJB /sIiz///J7NDJPpKuYODj2hniXp+OzBvwirZCa5bAImHavEJVx5+q/a06i2pPMOlrBKi1c 5po637UE/fc/BigWIc1v+uFcG8ZkxyIGiCUYuC/ppm4yXwyQcqZlfDc4dtowtm/bxiQkqX WBbEOFkfj9uwAsUWTJTzXBtaE/zHoIjcwc3GDnM+ociiGe9kmX2SoVpYve3YMQ== 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 4PSHfg3vVmzPRm; Thu, 2 Mar 2023 17:10:19 +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 322HAJbu028204; Thu, 2 Mar 2023 17:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HAJ4r028203; Thu, 2 Mar 2023 17:10:19 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:10:19 GMT Message-Id: <202303021710.322HAJ4r028203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 572900bd93fd - releng/13.2 - stand: fix build userboot without zfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 572900bd93fdbbc2b42f0ad7374f390d8dd54de8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=572900bd93fdbbc2b42f0ad7374f390d8dd54de8 commit 572900bd93fdbbc2b42f0ad7374f390d8dd54de8 Author: Michael Paepcke AuthorDate: 2023-02-28 02:58:03 +0000 Commit: Warner Losh CommitDate: 2023-03-02 17:09:32 +0000 stand: fix build userboot without zfs Fix regression in building userboot -DWITHOUT_LOADER_ZFS Fixes: e307eb94ae520 MFC After: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/665 Approved by: re@ (cperciva) (cherry picked from commit 4d59545d0cacb5881e2515eecce15e8478f07276) (cherry picked from commit 3464fc5f2a3376b4cd5612f1ee0986072b4a65f3) --- stand/userboot/userboot/Makefile | 4 ++++ stand/userboot/userboot/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 43011b9577c9..986bfdccfdd6 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -36,9 +36,13 @@ SRCS+= gfx_fb_stub.c CFLAGS+= -Wall CFLAGS+= -I${BOOTSRC}/userboot + +.if ${MK_LOADER_ZFS} != "no" CFLAGS.main.c+= -I${BOOTSRC}/libsa/zfs CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs +.endif + CWARNFLAGS.main.c += -Wno-implicit-function-declaration CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 40911f35020a..b134d86de9bd 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "bootstrap.h" #include "disk.h" #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) +#include #include "libzfs.h" static void userboot_zfs_probe(void);