Message ID | 20121104195837.5C16920065F@gemini.denx.de |
---|---|
State | Not Applicable |
Headers | show |
On Sun, Nov 04, 2012 at 08:58:37PM +0100, Wolfgang Denk wrote: > Dear Tom, > > In message <20121104184959.GN15839@bill-the-cat> you wrote: > > > > With the official closing of the merge window just past us now, I've > > tagged v2013.01-rc1. > > Thanks a lot - a minor nitpick: as is, we have a somewhat ugly version > string "2013.01.-rc1". > > Please consider (at least for future elease candidates) something like > this: > > From 2ff9125440c6821d94b8e2ddf98d5dc75d6383c8 Mon Sep 17 00:00:00 2001 > From: Wolfgang Denk <wd@denx.de> > Date: Sun, 4 Nov 2012 20:54:10 +0100 > Subject: [PATCH] Makefile: use EXTRAVERSION for -rc? tag > > When using SUBLEVEL for the -rc? tag, this results in an ugly version > string like "2013.01.-rc1" - let's use EXTRAVERSION instead to get the > simple ""2013.01-rc1" First bug of -rc1 and it's brown paper bag time, filled in the wrong field. I guess that's what I get for working on this while working on a cake..
diff --git a/Makefile b/Makefile index bc15209..e144eb1 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,8 @@ VERSION = 2013 PATCHLEVEL = 01 -SUBLEVEL = -rc1 -EXTRAVERSION = +SUBLEVEL = +EXTRAVERSION = -rc1 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else