From nobody Fri Jul 22 16:08:59 2022 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 4LqDrr2BpFz4XX6h; Fri, 22 Jul 2022 16:09:00 +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 4LqDrr1Dnjz3TX0; Fri, 22 Jul 2022 16:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658506140; 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=JI2Tx6+zgY3JGcwXYFcDcuzJEy3SbqkfhFLt56rZLHY=; b=QB/11FSYzNIk96YKp6KYkLgWoMZ4zyFETl4BywrHBpa5RnpsfKCgUu2f5Tfnjoz+kDqHNs 7EeIu5kK3nE5SWrwTYQsbCL7qq+4Yzs2SON0R5ydmUnjOWT9hO38FkzyruWVikHVIF2ljt 57jUXre+VxKPMwTY+PB8kU9SaxqRU375x6wUn9nN8Zvb02kdn2cPujwmlRNUUbuHwu6aFy pj1szF/uT3/GnM35T5trnVvZPId8oExf5y5Jt4ynhkg640IKw2lAEynSe2P+zD6nKsrbHX 7RbkaMR8TNQCAWB7vtPZb+O3gTp/6td4AiHO5v0S2Qm+Q7NZcpK4+dVnT+8zLw== 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 4LqDrr04qRz15jH; Fri, 22 Jul 2022 16:09:00 +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 26MG8xwR048992; Fri, 22 Jul 2022 16:08:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26MG8xIK048991; Fri, 22 Jul 2022 16:08:59 GMT (envelope-from git) Date: Fri, 22 Jul 2022 16:08:59 GMT Message-Id: <202207221608.26MG8xIK048991@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: d1fb0e1dc8ec - main - stand libsa: Restore include path to LDRSRC for disk.h for filesystems. 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: d1fb0e1dc8ec983456f251d26d7d3508368a2b16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658506140; 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=JI2Tx6+zgY3JGcwXYFcDcuzJEy3SbqkfhFLt56rZLHY=; b=YtLDJH9wmrXCbiohbuLTi+jBkOHqXodHzl/XFLU8e/4MViPszib/OoU8ZGeI1v2tr2b26N s8CEXKYHguvSD/q1qgW/X//M7OCe7Jpxy3UV2MTRx4YV0Et3qYp8iTZ2HTqL5za/EMU1Tm rRXq+QwVyx6VHgul2GS04oWkmsrFVzdck6l4szvd4FuP/iHYstZ2FxeIoLH2h7Znaid976 RVxtAihcGjMBOFT1eUEX5nrVA7SlUEMfZiGNS4rgNHj7fT9GwHlOqmlpK5V5r3Aqb2BN35 SeQRknjmXbExYbkFrlQvqkc1KJ1Xel3/uvWwyHf8jZph6Lo4j8Fa0/c0hMElaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658506140; a=rsa-sha256; cv=none; b=Zs1ntDiBuwvtonokW/yYwOt7nnruRh6on4IY7lOVdav9oyu0NH4kORMJSFLJYASsTNAayF pKkH/+4JJGQ+k+VSTNKj8IJpspzHmlPd2Vs/+w7BoYYe4vFjemGT6AM8SoMCRaik/KUmEx diXoyzURrovcyl138eqh3oMnVcOhYwvmjUXS29205C4w7Vt82MuF5Zt8ANk2QAllEfSk35 vXzKC8tE5mIwhGh9eOs97YCH9IG2HvMoN07Plhi8BTmib20sc6PzMnebanO1bpPO740L15 EFZKX/6DF0mCV+l+GqUZXHAprhcgkZNeV4rBrcSl2ebhAQ0cXqcy9BASGaBTZQ== 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=d1fb0e1dc8ec983456f251d26d7d3508368a2b16 commit d1fb0e1dc8ec983456f251d26d7d3508368a2b16 Author: John Baldwin AuthorDate: 2022-07-22 15:53:57 +0000 Commit: Warner Losh CommitDate: 2022-07-22 16:08:40 +0000 stand libsa: Restore include path to LDRSRC for disk.h for filesystems. In theory they shouldn't need anything outside of libsa, but disk.h and bootstrap.h are currently required. Future work wil address this issue. This fixes the build with MK_LOADER_ZFS=no. ZFS's Makefile.inc adds these flags globally to CFLAGS when it should not. This masked the problem because the tools/boot/universe.sh didn't build MK_LOADER_ZFS=no as part of its regressions. Future work will also fix this. Obtained from: CheriBSD Fixes: 84bf2bbbecc3 stand: constrain zlib/gzip CFLAGS better Sponsored by: DARPA Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35860 --- stand/libsa/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index dc35fe007506..6351027c99cd 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -170,6 +170,9 @@ SRCS+= time.c .PATH: ${SRCTOP}/sys/ufs/ffs SRCS+=ffs_subr.c ffs_tables.c +CFLAGS.dosfs.c+= -I${LDRSRC} +CFLAGS.tftp.c+= -I${LDRSRC} +CFLAGS.ufs.c+= -I${LDRSRC} CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS} CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS} CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS