From nobody Mon Jun 14 15:46:07 2021 X-Original-To: freebsd-git@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 4129A11DAF4F for ; Mon, 14 Jun 2021 15:46:20 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G3bQh1FVCz3Qn7; Mon, 14 Jun 2021 15:46:19 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f44.google.com with SMTP id 6-20020a9d07860000b02903e83bf8f8fcso11207902oto.12; Mon, 14 Jun 2021 08:46:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CswiBLRpgVJ19n7vBJlWB5A0ApM+gF6M1ZaoHV3EEJY=; b=A9a64WZsllRifjQHbet8zHUEOcDDiFH9mwXkkx9Pyqcy/FzUk8nhOy5Dwt74mbvkdy FFcU9zzvR4++RqUkFCaf4LXdirbMgsu4k7x1jVHePOi73fiMOziWpBiKfEMdFtwHP+X3 i2YNVYM3D0E4kOncutYQOO/3XAeuVIyBoAx/ny9xf9AoYAX+o7vzO1dMut2KbFZPYexn TFYmF3r3Y9IFUwFz3UD5Tudfkp2lAYXTkxofGouWM9j8SaDDL1+6OG4dJSjvANDdbE/g SrLhfWubJz6UnWw93tECdQh+pt8ffvg/OqMNL3sVmL4w90ZX4FJbYmwoLMmSaHiLgd3k MVeA== X-Gm-Message-State: AOAM5307G34yV87LtRD0vVcimltpBoiCnVGCf5NDQSVPAzMkmgSx8N+0 hl39vsRlprhRcPUxi9DQfToZ1fvi+i5FdJrOMYZIAUbDD9s= X-Google-Smtp-Source: ABdhPJzSeol05hw0XC1QP2S7gBloavzvuEtQFDDO9+nkSweO1jLjP+qrII/5z8uldu5CcNcIykJ9t5TtSkuf2oqIscA= X-Received: by 2002:a05:6830:1bcb:: with SMTP id v11mr14420873ota.251.1623685578281; Mon, 14 Jun 2021 08:46:18 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <202106081453.158Eri7k025234@gitrepo.freebsd.org> In-Reply-To: From: Alan Somers Date: Mon, 14 Jun 2021 09:46:07 -0600 Message-ID: Subject: Re: Git submodules in OpenZFS To: Ed Maste Cc: freebsd-git , Martin Matuska Content-Type: multipart/alternative; boundary="0000000000001ed67105c4bbc274" X-Rspamd-Queue-Id: 4G3bQh1FVCz3Qn7 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Spam: Yes X-ThisMailContainsUnwantedMimeParts: Y --0000000000001ed67105c4bbc274 Content-Type: text/plain; charset="UTF-8" On Mon, Jun 14, 2021 at 9:40 AM Ed Maste wrote: > On Tue, 8 Jun 2021 at 10:53, Martin Matuska 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 > > AuthorDate: 2021-06-08 14:48:37 +0000 > > Commit: Martin Matuska > > 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--