From nobody Tue Feb 28 03:00:29 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 4PQhv13RV5z3tnx8; Tue, 28 Feb 2023 03:00: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 4PQhv12sfvz4Nkh; Tue, 28 Feb 2023 03:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677553229; 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=mBQ8Vibe88dk7oXK4NDrWpiEVNd5D3jz0d4bwMTCpGY=; b=BHxliEmiqBjM/bi2hxfPzafmsstsP3Co2AedeaErtnt22+nLZAGfTuFQRj9+zKN9JE/8+i pVp7Ybj+fUBug9xqGDXBo6E5pr6eTeFpUaVBcN0xQDhSWqDUHLvQWbxw/uhKOZA0egyAlh 0/iOmThBMDL6GanarEctCFuwJQJxntYZzpQGGtEFv+baNmKHEwC17lpXj0L++4B1CjzuI5 MatJVrFsPgP87WrGltl0wDNVrb5ZQDXJJkTNTW3d/l7zzq/m1A4SntXNtZspkGcv4cFn94 kgUd3QI2edhPZMCpQ9VPDGxh08iaq2BfX6oYbam4F6fUoBYXJrfbn0XYzZmV+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677553229; 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=mBQ8Vibe88dk7oXK4NDrWpiEVNd5D3jz0d4bwMTCpGY=; b=cMKZLvtZ45s1jV9BHzZtjk4lg/D1waVpBna3Gzn2iLY5TnqNIAMuhbBRL53V9uR8uru2B0 9jZr68uTq1XSz+V9OilFhYUp+cFSjLeXH6nbZ7o+Tsco3e159zQ99FKbR2qMyKRuOcVLxm vYXHKzmeZTZ3naGrCsBxR9ECqArmmMIBR9YqgpShej7V2Ppn9bbUVL/WgNIaVP1imcSEJt h3OBXFq9Pk3/Ya5cwXx464b0mgvYMcWMeFIsQNEeEinabSRXKlvj7gR8NqKjpicZyrVMxi 4akXsgiaOuKoRlT5qV/kz3jB7Qm62l3P6+uVdYEu71mpDlelJifOYkwy7AtHCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677553229; a=rsa-sha256; cv=none; b=x2hCKEGnMdheRD8rMnHz5AaCOl4/Lx8dcLxgh51pf/NmKUdgCj+a/2K4zrabOwd2LMmsc5 5sdHydXXKyhyptuWnjypTsH4wnd6vJkW3T3+zZuE4O5j1uHzgW8xeJVHuHjpt7Jd/dYyRN nmuydFE6O5TQ3FDE0/GIztIme/vt9Ysv4ffZFaPJw8JLPGyyyaUuJSAyQgRDXfRuLeVSGc 4NaOIzH3SKTd3ir2bIXCZFM8oDfRD8iiHMRF2kTQF7P7uolrWJchNjuSH22PAhV4CNR/rJ xtOEKC36Du0Q79ecnxl1XNI/u2skk+wB9/ol5oXOc+iCnuQ8bQ5YjaSdc7oyEA== 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 4PQhv11wtmzr0q; Tue, 28 Feb 2023 03:00: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 31S30TUE098616; Tue, 28 Feb 2023 03:00:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S30TGU098615; Tue, 28 Feb 2023 03:00:29 GMT (envelope-from git) Date: Tue, 28 Feb 2023 03:00:29 GMT Message-Id: <202302280300.31S30TGU098615@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: 3464fc5f2a33 - stable/13 - stand: fix build userboot without zfs 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3464fc5f2a3376b4cd5612f1ee0986072b4a65f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3464fc5f2a3376b4cd5612f1ee0986072b4a65f3 commit 3464fc5f2a3376b4cd5612f1ee0986072b4a65f3 Author: Michael Paepcke AuthorDate: 2023-02-28 02:58:03 +0000 Commit: Warner Losh CommitDate: 2023-02-28 02:58:03 +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 (cherry picked from commit 4d59545d0cacb5881e2515eecce15e8478f07276) --- 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);