From 06f9fe68c002c70e4e0df9a2b63286f6a5f3616f Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Fri, 5 Apr 2013 22:27:57 +0200 Subject: Build system: CI: unset variables before starting build Signed-off-by: Abdoulaye Walsimou Gaye --- defconfigs/arm/arm-ci-build.sh | 2 +- defconfigs/ci-build.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/defconfigs/arm/arm-ci-build.sh b/defconfigs/arm/arm-ci-build.sh index 6c71fa3..5ac4547 100755 --- a/defconfigs/arm/arm-ci-build.sh +++ b/defconfigs/arm/arm-ci-build.sh @@ -1,7 +1,7 @@ #!/bin/sh arm_perror() { - echo "[IC-BUILD-ERROR] ARM: $1" + echo "[CI-BUILD-ERROR] ARM: $1" } cibuild_kconfig=$workspace/cibuild-arm.kconfig diff --git a/defconfigs/ci-build.sh b/defconfigs/ci-build.sh index b2cfa7b..51145f3 100755 --- a/defconfigs/ci-build.sh +++ b/defconfigs/ci-build.sh @@ -3,15 +3,15 @@ # NOTE: this script only accepts long options perror() { - echo "[IC-BUILD-ERROR] : $1" + echo "[CI-BUILD-ERROR] : $1" } pwarning() { - echo "[IC-BUILD-WARNING]: $1" + echo "[CI-BUILD-WARNING]: $1" } pinfo() { - echo "[IC-BUILD-INFO] : $1" + echo "[CI-BUILD-INFO] : $1" } options=$(echo $* | sed 's/=/ /g') @@ -79,5 +79,6 @@ cd $workspace && rm -rf .config .config.old && gmake clean # Now generating .config # +set -- cat $workspace/defconfigs/common.kconfig >> $workspace/.config cd $workspace && rm -rf $workspace/generated/* && gmake olddefconfig && gmake -- cgit v1.2.3