Re: [Minios-devel] [UNIKRAFT PATCH] build: properly separate UK_EXTRAVERSION in version string

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Looks good, thanks!

Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

On 07.03.19, 17:10, "Florian Schmidt" <Florian.Schmidt@xxxxxxxxx> wrote:

    Signed-off-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
    ---
     Makefile | 6 +++++-
     1 file changed, 5 insertions(+), 1 deletion(-)
    
    diff --git a/Makefile b/Makefile
    index 8e81c64b..7f29e006 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -131,7 +131,11 @@ include $(CONFIG_UK_BASE)/version.mk
     
     # Compute the full local version string so packages can use it as-is
     # Need to export it, so it can be got from environment in children (eg. 
mconf)
    -export UK_FULLVERSION := 
$(UK_VERSION).$(UK_SUBVERSION)$(UK_EXTRAVERSION)$(shell $(SCRIPTS_DIR)/gitsha1)
    +ifdef UK_EXTRAVERSION
    +export UK_FULLVERSION := 
$(UK_VERSION).$(UK_SUBVERSION).$(UK_EXTRAVERSION)$(shell $(SCRIPTS_DIR)/gitsha1)
    +else
    +export UK_FULLVERSION := $(UK_VERSION).$(UK_SUBVERSION)$(shell 
$(SCRIPTS_DIR)/gitsha1)
    +endif
     
     # Default image name
     export CONFIG_UK_NAME ?= $(notdir $(APP_DIR))
    -- 
    2.21.0
    
    

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel