From 56434332b1d718ebf610e80a5d6043f3e28dba16 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 10 Oct 2013 23:45:29 +0200 Subject: [PATCH] Make some values of default build profiles overridable. * Defining things like HAIKU_ROOT_USER_NAME in UserBuildConfig now has an effect on the image again. --- build/jam/DefaultBuildProfiles | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles index 4615f55f73..d780c23fd4 100644 --- a/build/jam/DefaultBuildProfiles +++ b/build/jam/DefaultBuildProfiles @@ -29,11 +29,11 @@ rule DefineDefaultBuildProfiles switch $(HAIKU_BUILD_PROFILE) { case "alpha-*" : { Echo Building Haiku R1/alpha ; - HAIKU_ROOT_USER_NAME = user ; - HAIKU_ROOT_USER_REAL_NAME = "Yourself" ; + HAIKU_ROOT_USER_NAME ?= user ; + HAIKU_ROOT_USER_REAL_NAME ?= "Yourself" ; AddGroupToHaikuImage party : 101 : user sshd ; - HAIKU_IMAGE_HOST_NAME = shredder ; - HAIKU_IMAGE_SIZE = 800 ; + HAIKU_IMAGE_HOST_NAME ?= shredder ; + HAIKU_IMAGE_SIZE ?= 800 ; AddHaikuImagePackages bepdf @@ -81,11 +81,11 @@ rule DefineDefaultBuildProfiles case "nightly-*" : { Echo Building Haiku Nightly ; - HAIKU_ROOT_USER_NAME = user ; - HAIKU_ROOT_USER_REAL_NAME = "Yourself" ; + HAIKU_ROOT_USER_NAME ?= user ; + HAIKU_ROOT_USER_REAL_NAME ?= "Yourself" ; AddGroupToHaikuImage party : 101 : user sshd ; - HAIKU_IMAGE_HOST_NAME = shredder ; - HAIKU_IMAGE_SIZE = 600 ; + HAIKU_IMAGE_HOST_NAME ?= shredder ; + HAIKU_IMAGE_SIZE ?= 600 ; AddHaikuImagePackages man @@ -104,8 +104,8 @@ rule DefineDefaultBuildProfiles case "bootstrap-*" : { Echo Building Haiku Bootstrap ; - HAIKU_IMAGE_HOST_NAME = shredder ; - HAIKU_IMAGE_SIZE = 20000 ; + HAIKU_IMAGE_HOST_NAME ?= shredder ; + HAIKU_IMAGE_SIZE ?= 20000 ; AddHaikuImagePackages autoconf