From 315da4ffb31fce01f26423f5ab4c61f4dc64f228 Mon Sep 17 00:00:00 2001 From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Date: Sun, 15 Feb 2015 21:52:12 +0100 Subject: [PATCH] config: introduce ISO_PATTERN_FLAGS Ubuntu iso names follow different pattern on different servers and/or channels. Introduce a new config option to differentiate them and future ones. --- Makefile | 4 +++- config/Makefile.conf.defaults | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b9ef0c..52b2cd5 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,9 @@ ISO_IMAGE=$(ISO_IMAGE_DEST)/image.iso ISO_URL=$(ISO_BASE_URL)/$(ISO_RELEASE)/$(ISO_CHANNEL) ISO_CONTENT=$(ISO_IMAGE_DEST)/content -ifndef ISO_PREFIX +ifneq (,$(findstring release-prefix,$(ISO_PATTERN_FLAGS))) + ISO_PREFIX=$(ISO_RELEASE)- +else ISO_PREFIX=$(ISO_FLAVOR)-$(ISO_VERSION)- endif diff --git a/config/Makefile.conf.defaults b/config/Makefile.conf.defaults index d8a8777..0ba1bed 100644 --- a/config/Makefile.conf.defaults +++ b/config/Makefile.conf.defaults @@ -25,6 +25,7 @@ ISO_RELEASE=trusty ISO_CHANNEL=release ISO_VERSION=14.04.1 ISO_FLAVOR=kubuntu +ISO_PATTERN_FLAGS= IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick IMAGE_GIT_BRANCH=ws14 -- GitLab