From nobody Sat Feb 25 17:16:14 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 4PPD1p5ZpCz3tfCk; Sat, 25 Feb 2023 17:16:14 +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 4PPD1p3gR9z3pNR; Sat, 25 Feb 2023 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677345374; 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=y7/N5myjdDuzw6GsTkHVHEvmcfsnw2BlVgXXPfQZj00=; b=xmgvc4q9Rz5M346O1Lf4tryvcMWDokruDXVJ0HB9PUGirpTbuA/8ra43a9ZSnAeSxQt3fE Qx2pCeFO6bnOdE+mNwaEg4v8g9Mbujf/m9QCBAgInWt6UFSfSl8FtdMOaDpYao3zVtM2oZ lBenjb5eOfeBQHNRMuI19XnEgy75INw8IuzUaWMa6k0tQDKujsPxASQ6zklc1T91SVVp65 dhlAWbdpCO21PKgWFfRHU8ghFd6heuOfmguEji1rFk2S4gdv027QUJoPjVwgu3pQJFjBUj H+Oh5+oojB0C+VSOkhDONUaLW3tQ1WnvSsKkRYALni7eyFSCdtkyvabdaouNBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677345374; 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=y7/N5myjdDuzw6GsTkHVHEvmcfsnw2BlVgXXPfQZj00=; b=gfDZ/fwtBWaKmTXIeizMlZmEQ19Cl/qCa/ZC4W7wfgcn85sigbaAWsLbA+bp3zjRa6lWVm td188zSdP8cBPLZcq4ME5qprtlRXhWd15pbxA0chb2mB/lscPrPYWr95PbwcfaUy61qffg r/QEZtQNmGG4o7Hex08/t7QH144RNRJEVmxqcbuD73VyWRh21ohZtmBAJMte89LDsHtrZT GY06eKyutzunFC3kkrBPLJcyqHtTZY6zEU0C8cmHDhbYGCFwR775amKiE3YjXRooZsMWM2 7tLGjCOEyNo79bvwK/hgRrDEP+YC/fJ+MLxvZDtpypkaeovdm0kmKcXmx46rTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677345374; a=rsa-sha256; cv=none; b=wJo8wgy3xHh3lf4Mj9ki+KOjqTiyOijmk0aAkN0QaTrbgqYk6Bhb8wg/CMe23jGgrHOY4b P28cfpDt8MSj4t8jPY/JDX4Lei1RYtIsPF1rBVsfn8WUCOI5AbgJrjitZnp5Y2nNouESJs eE1gOYx1HinPXLMREvPcQz4bd0ErnQtHhzxRNlSMre8eEOadbpSYMPLvDlUX28TDt5TCRV OIwMmUQitvyQa3vaJhu/S6skgv05jpCRJe77Xpiwv8v0EyDNlXbbOoc7yTaZziGlksKd2n WXAqRBH8+ctk3SyifzPRkhgL5zngQ0i2IoRE06bPYvOpNSJJVYkHw24OROTZ3A== 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 4PPD1p2mzzz1Bp8; Sat, 25 Feb 2023 17:16:14 +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 31PHGEKK040868; Sat, 25 Feb 2023 17:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31PHGE30040867; Sat, 25 Feb 2023 17:16:14 GMT (envelope-from git) Date: Sat, 25 Feb 2023 17:16:14 GMT Message-Id: <202302251716.31PHGE30040867@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: 4d59545d0cac - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4d59545d0cacb5881e2515eecce15e8478f07276 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d59545d0cacb5881e2515eecce15e8478f07276 commit 4d59545d0cacb5881e2515eecce15e8478f07276 Author: Michael Paepcke AuthorDate: 2023-02-24 19:27:40 +0000 Commit: Warner Losh CommitDate: 2023-02-25 17:14:07 +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 --- 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);