Date: Mon, 14 Jun 2021 09:46:07 -0600 From: Alan Somers <asomers@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: freebsd-git <freebsd-git@freebsd.org>, Martin Matuska <mm@freebsd.org> Subject: Re: Git submodules in OpenZFS Message-ID: <CAOtMX2gmPymDuVMuy9mad=7E0sRqGMbOquOrsjEp5-cboWYhUA@mail.gmail.com> In-Reply-To: <CAPyFy2DSn%2BFY0Ghe0W7FkVNH%2BtBwSS_Es_6N%2B-SAg-K_fUxz1A@mail.gmail.com> References: <202106081453.158Eri7k025234@gitrepo.freebsd.org> <CAPyFy2DSn%2BFY0Ghe0W7FkVNH%2BtBwSS_Es_6N%2B-SAg-K_fUxz1A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000001ed67105c4bbc274 Content-Type: text/plain; charset="UTF-8" On Mon, Jun 14, 2021 at 9:40 AM Ed Maste <emaste@freebsd.org> wrote: > On Tue, 8 Jun 2021 at 10:53, Martin Matuska <mm@freebsd.org> wrote: > > > > The branch main has been updated by mm: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=1603881667360c015f6685131f2f25474fa67a72 > > > > commit 1603881667360c015f6685131f2f25474fa67a72 > > Merge: ed9215c8e05f 75b4cbf62590 > > Author: Martin Matuska <mm@FreeBSD.org> > > AuthorDate: 2021-06-08 14:48:37 +0000 > > Commit: Martin Matuska <mm@FreeBSD.org> > > CommitDate: 2021-06-08 14:52:44 +0000 > > > > zfs: merge openzfs/zfs@75b4cbf62 (master) into main > > It turns out this has the side-effect of introducing submodule use, in > sys/contrib/openzfs/scripts/zfs-images. We can mostly ignore this for > FreeBSD, but it can introduce an issue for downstream projects that > intend to use submodules for some portion of their tree. > > I encountered this because I have a WIP tree that incorporates pkg and > drm-kmod via submodules, and updating it produced the error: > > fatal: No url found for submodule path > 'sys/contrib/openzfs/scripts/zfs-images' in .gitmodules > > There are a few different ways I think we could address this. Assuming > we don't need to use zfs-images in FreeBSD I believe the easiest will > be to just delete the directory/submodule in FreeBSD, e.g. `git rm > sys/contrib/openzfs/scripts/zfs-images`. > +1 --0000000000001ed67105c4bbc274--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2gmPymDuVMuy9mad=7E0sRqGMbOquOrsjEp5-cboWYhUA>