From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58171C001E0 for ; Wed, 2 Aug 2023 16:32:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FE008686F; Wed, 2 Aug 2023 18:32:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="MlDoTrZh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 98AF98686A; Wed, 2 Aug 2023 18:32:38 +0200 (CEST) Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1033086875 for ; Wed, 2 Aug 2023 18:32:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb2e.google.com with SMTP id 3f1490d57ef6-cfd4ea89978so7189605276.2 for ; Wed, 02 Aug 2023 09:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1690993955; x=1691598755; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=aotD0JjC3y8rOf5/QK0/1rcxf2lQcny5SgkQ689k+lk=; b=MlDoTrZhe6L26xVUbxYp70T8ri1lo2v6kibJy77DOKZOAKNzalwZXFUGpQki58oqcw G1xAm1MtLO4elS5w9i69hWXKENvlzGW2ITmahKFaokqzFgth5BrIRWgF5uJcR1f+rAVo vnIXUcPAIrA0lvvJYY8fELZJihbN9XfU+bakg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690993955; x=1691598755; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aotD0JjC3y8rOf5/QK0/1rcxf2lQcny5SgkQ689k+lk=; b=DDVz5wE7eA4zfrnzAeHswRZ9Y7m9zKj6ZE1N1bG0j5PbRET6WUouCYJTkGxNCdk3cd VNjbPcXEdpHT0aSmUIOzys2oPB3aHve6yEe78jztwOeL1YtV9JSNSCMOX3JWfyzcXqKl I4gGOPosYyT6PUIHXfP1QPCDcASm/l3r95O5urGEbAtwlEyd0L335W8/rGNVQnXAOZsU QLQzZvA9wqh1Qs8ms838AT5QXB2rSXMWaaqJJ94zpSOy3QvPcTqytqnskc+Gn/NVemx1 mRn9rHoyuY4fCgh2MO5SrQetzxKTQD55DWDLuiiqhcbW0ywWObNw4N3MntjPB3jDBR+T kasA== X-Gm-Message-State: ABy/qLZtiN9eKu0XEWENgXueyUzYh+4aiWXi5pdgyeJJhPRWcr2hQo8F trKG4VTWJDR3uxpp6QhZnrcFUg== X-Google-Smtp-Source: APBJJlGZCjf5YJ7Z0gwk30tOb5Dm1TkgcrRsZ8GIWKzHEDeYcx8BguN6yoWNbuQmmuPOa/ng4gdLYw== X-Received: by 2002:a25:40d2:0:b0:d1d:b3a1:f28a with SMTP id n201-20020a2540d2000000b00d1db3a1f28amr16240694yba.35.1690993954775; Wed, 02 Aug 2023 09:32:34 -0700 (PDT) Received: from bill-the-cat (2603-6081-7b00-6400-38a3-d353-a65e-b181.res6.spectrum.com. [2603:6081:7b00:6400:38a3:d353:a65e:b181]) by smtp.gmail.com with ESMTPSA id o194-20020a25d7cb000000b00ceb2ac48b9dsm3947379ybg.10.2023.08.02.09.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 09:32:34 -0700 (PDT) Date: Wed, 2 Aug 2023 12:32:32 -0400 From: Tom Rini To: Maxim Uvarov Cc: Peter Robinson , Ilias Apalodimas , u-boot@lists.denx.de, pbrobinson@redhat.com, joe.hershberger@ni.com, rfried.dev@gmail.com, goldsimon@gmx.de, lwip-devel@nongnu.org Subject: Re: [PATCHv4 1/5] net/lwip: add lwip-external submodule Message-ID: <20230802163232.GA3630934@bill-the-cat> References: <20230714142000.5534-1-maxim.uvarov@linaro.org> <20230714142000.5534-2-maxim.uvarov@linaro.org> <20230728180851.GT3630934@bill-the-cat> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Kjjq07P8VZX3oKPe" Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean --Kjjq07P8VZX3oKPe Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 02, 2023 at 02:03:04PM +0600, Maxim Uvarov wrote: > On Mon, 31 Jul 2023 at 04:06, Peter Robinson wrote: >=20 > > On Fri, Jul 28, 2023 at 7:09=E2=80=AFPM Tom Rini w= rote: > > > > > > On Thu, Jul 27, 2023 at 03:34:48PM +0300, Ilias Apalodimas wrote: > > > > > > > Tom, Simon > > > > are you ok with submodules on this one? > > > > > > Still punting on that question and waiting for commentary from > > > distribution people. > > > > I would prefer not to have to deal with submodules unless the required > > bits were pulled as part of the release tarball process where it > > wouldn't then matter to distributions. > > > > Peter > > >=20 > Ilias pointed to an interesting alternative which edk2 uses its git > subtrees. > Docs: > https://www.atlassian.com/git/tutorials/git-subtree > https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt >=20 > Examples: > git subtree add --prefix lib/lwip/lwip-external > https://git.savannah.nongnu.org/git/lwip.git master --squash > $ git log > commit 83488286d287e53fad1efbfe1d4f5dbf69202f4a (HEAD -> master) > Merge: 27b050e91d 120e0665c3 > Author: Maxim Uvarov > Date: Wed Aug 2 07:53:17 2023 +0000 >=20 > Merge commit '120e0665c37ec69d46c10fc341e253ae2e69afca' as > 'lib/lwip/lwip-external' >=20 > commit 120e0665c37ec69d46c10fc341e253ae2e69afca > Author: Maxim Uvarov > Date: Wed Aug 2 07:53:17 2023 +0000 >=20 > Squashed 'lib/lwip/lwip-external/' content from commit 84fde1ebbf >=20 > git-subtree-dir: lib/lwip/lwip-external > git-subtree-split: 84fde1ebbfe35b3125fc2d89b8a456cbacf148e9 >=20 >=20 > So it actually plases code of lwip.git into a subdirectory as a git > commit. When you do git clone then all sources will be fetched. > No need for any additional commands after that. I vote for subtree instead > of plain code copy. Since I think we could use this to start off on one stable tag and then merge to the next as they come out (which is likely the cadence we want), this does seem like the reasonable way forward. Too late for v5, but for v6 can you please make sure the doc contains (and an easy way to test this would be to start with say STABLE_2_1_0_RELEASE and move it up to STABLE_2_1_3_RELEASE) an example / instructions on how to use subtree to perform the updates. --=20 Tom --Kjjq07P8VZX3oKPe Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmTKhRwACgkQFHw5/5Y0 tyybfgv+MwX1w996DcK26XA55L3mhS/s/6NhmYDBx929KTwiaky9EYIbW6JKf3Ly M4hAE7t3rIPc4Ydf9tfivSK/jOZnbyW53pkEAiaJTegk7whc8qm6vqd9AVb4op+H IOowgtEZteYbXNha6bUEu3xAWbFDcDh/qWv88LQPfHsfIy000Jbx9iRpDdY4w+Ii s6v1gj392R8ldDmW8/t6R0VvPi5k69L2MaWNz1WS54YoJ0t768qpMnw9/T+K7wGc 0SDrLbABrEXHhkSKCTSRDv9F97bmkbNnom2UwR0z8P3iJtjEPAxwcvZs+AXnPYRm EaaOcAvvIHwJul47vquDKgD8c4Fjo9ypHVjSKkYLlxahmKWMAX0HtHFpRxqrviiC cf5EfPlmDhHQL9ZODYPRJFtESaF4cGA/Deh6yli1u3VAOsYsJXnuJFN/CGca96ju +ydCJWJ9JB6JFs8wALBVYjSSIina2i/LAfme8vaX1Zk8zKbcMVl7npCzAF6yE3+9 S2Dpo3rE =ZB/e -----END PGP SIGNATURE----- --Kjjq07P8VZX3oKPe--