From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Fri, 11 Jan 2019 09:15:52 +0100 Subject: [Buildroot] [PATCH] support/scripts/apply-patches: use "git apply" as a fallback when applying patches In-Reply-To: <87wonbhnny.fsf@tarshish> References: <20190110203004.9812-1-thomas.petazzoni@bootlin.com> <87wonbhnny.fsf@tarshish> Message-ID: <20190111091552.72fba6ad@windsurf> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello, On Fri, 11 Jan 2019 05:35:13 +0200, Baruch Siach wrote: > > Switching everybody to unconditionally use "git apply" seems a bit > > risky, so instead we take a different route: if applying the patch > > with "patch" fails, then we try with "git apply". > > This makes git a host dependency. Should we add host-git, or list git > with host requirements? It does not really make git a mandatory dependency. Indeed, "git apply" is only tried if "patch" fails. So, before my patch, if a patch failed to apply because "patch" failed, then it aborted the build. With my patch, if a patch fails to apply because "patch" failed, then we will try "git apply". If "git apply" is not available, it will fail, just like it used to be. So my proposal doesn't *require* git, it only tries harder to apply patches by using "git apply" if available. Setups that used to work today without "git" installed will continue to work with no change. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com