From: Tom Rini Date: Tue, 25 Aug 2020 10:57:27 -0400 Subject: [PATCH U-Boot] scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks In-Reply-To: <26b90a0f-6f92-27fc-4ac5-692a29983a16@prevas.dk> References: <20200825112950.6993-1-rasmus.villemoes@prevas.dk> <20200825125634.GL20605@bill-the-cat> <26b90a0f-6f92-27fc-4ac5-692a29983a16@prevas.dk> Message-ID: <20200825145727.GP20605@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tue, Aug 25, 2020 at 04:53:36PM +0200, Rasmus Villemoes wrote: > On 25/08/2020 14.56, Tom Rini wrote: > > On Tue, Aug 25, 2020 at 01:29:50PM +0200, Rasmus Villemoes wrote: > > > >> From: Brian Norris > >> > >> [linux commit ff64dd4857303dd5550faed9fd598ac90f0f2238] > >> > > >> scripts/setlocalversion | 12 ++++++++++-- > >> 1 file changed, 10 insertions(+), 2 deletions(-) > > > > It looks like we have one local change to setlocalversion since our sync > > from v3.16. Can you please re-sync us to the v5.8 release? Thanks! > > > > Hmm, I suppose I could, but it's not really clear whether we'd still > need to apply that fix (81630a3b38c2, scripts: setlocalversion: safely > extract variables from auto.conf using awk), or if that has been > obsoleted by your a356e7a86b83 (spl: Kconfig: Escape '$(ARCH)' in > LDSCRIPT entries). Ah, it's entirely likely we could just use setlocalversion as-is. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: