Date: Tue, 10 Sep 2024 11:42:40 -0400 From: Mark Johnston <markj@freebsd.org> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Alexander Motin <mav@freebsd.org>, FreeBSD User <freebsd@walstatt-de.de>, Martin Matuska <mm@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: e2df9bb44109 - main - zfs: merge openzfs/zfs@b10992582 Message-ID: <ZuBo8DMeOtEIFWcB@nuc> In-Reply-To: <CF98787C-2CBB-4E27-8F3E-0199E2C79052@freebsd.org> References: <202409091648.489GmCNu009544@gitrepo.freebsd.org> <20240909204632.78f3b525@thor.intern.walstatt.dynvpn.de> <a8354cd8-997e-4726-b5a6-40ff142821a5@FreeBSD.org> <CF98787C-2CBB-4E27-8F3E-0199E2C79052@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Sep 09, 2024 at 07:58:59PM +0100, Jessica Clarke wrote: > On 9 Sep 2024, at 19:52, Alexander Motin <mav@FreeBSD.org> wrote: > > > > On 09.09.2024 14:46, FreeBSD User wrote: > >> Am Mon, 9 Sep 2024 16:48:12 GMT > >> Martin Matuska <mm@FreeBSD.org> schrieb: > >> the commit seems to breaks buildworld for me, somehow: > >> [...] > >> /usr/src/sys/contrib/openzfs/module/os/linux/zfs/abd_os.c:61:10: fatal error: > >> 'linux/kmap_compat.h' file not found 61 | #include <linux/kmap_compat.h> > > > > I hit it also, but it has gone after I wiped the object directory and run a clean build. This commit uses different abd_os.c from different directory, and seems something is getting confused in the process. > > tools/build/depend-cleanup.sh needs to deal with > cddl/lib/libzpool/.depend.abd_os.* then (and libcompats). This should be done now in commit fd3d3240b0d7. (From what I see, libcompats are handled automatically when using clean_dep.)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZuBo8DMeOtEIFWcB>