diff options
| author | Shakeeb <shakeebbk@in.ibm.com> | 2016-08-27 08:15:16 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-08-30 06:00:17 -0400 |
| commit | 0d54a6f3cfdaa6663b4cd67fb82b311a64c11c7c (patch) | |
| tree | a2dbc438c090016dec8d8e9c05bf462fe02f1959 | |
| parent | 26c198fd789aa058c84f1b2229e93aedd6a422ea (diff) | |
| download | talos-sbe-0d54a6f3cfdaa6663b4cd67fb82b311a64c11c7c.tar.gz talos-sbe-0d54a6f3cfdaa6663b4cd67fb82b311a64c11c7c.zip | |
SBE code restructure: root level Makefile file
Change-Id: I50be7b537e51caf8dbbd67ace8808da35ea120fc
RTC:159709
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28873
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
| -rw-r--r-- | Makefile | 34 | ||||
| -rwxr-xr-x | sbe/build/tools/sbeGitTool.pl | 2 | ||||
| -rwxr-xr-x | sbe/test/citest/build-script | 3 | ||||
| -rwxr-xr-x | sbe/test/citest/populate-sandbox | 3 |
4 files changed, 38 insertions, 4 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..63876e0f --- /dev/null +++ b/Makefile @@ -0,0 +1,34 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: Makefile $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2016 +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG +BUILD_DIR = sbe/image +.PHONY: install all clean + +install: + $(MAKE) -C $(BUILD_DIR) install + +all: + $(MAKE) -C $(BUILD_DIR) all + +clean: + $(MAKE) -C $(BUILD_DIR) clean diff --git a/sbe/build/tools/sbeGitTool.pl b/sbe/build/tools/sbeGitTool.pl index aa7123fd..f0acd0c0 100755 --- a/sbe/build/tools/sbeGitTool.pl +++ b/sbe/build/tools/sbeGitTool.pl @@ -263,7 +263,7 @@ sub applyRefs sub compileAndCopy { my $statusFile = $globals{sbe_git_root}."/compile.status"; - my $compile_path = $globals{sbe_git_root}."/sbe/image"; + my $compile_path = $globals{sbe_git_root}; print "Compiling and copying the generated binaries to sandbox\n" if $debug; open SBWORKON, " | ./sb workon"; diff --git a/sbe/test/citest/build-script b/sbe/test/citest/build-script index 00ef83c6..8250ad08 100755 --- a/sbe/test/citest/build-script +++ b/sbe/test/citest/build-script @@ -7,6 +7,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,9 +40,7 @@ source "$SBEROOT/sbe/test/citest/setup-env" # Build . -cd sbe/image scl enable devtoolset-2 " bash -c \"make install\"" || exit -1 -cd - # Create simics sandbox. create-sandbox > create-sandbox.log 2>&1 & diff --git a/sbe/test/citest/populate-sandbox b/sbe/test/citest/populate-sandbox index 91d646f0..7df47896 100755 --- a/sbe/test/citest/populate-sandbox +++ b/sbe/test/citest/populate-sandbox @@ -7,6 +7,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -56,5 +57,5 @@ execute_in_sandbox "cd $SBEFW_DIR; mk install_all" \ # Copy test files. -cp $SBEROOT/sbe/test/* $SBETESTDIR/ || exit -1 +cp -r $SBEROOT/sbe/test/* $SBETESTDIR/ || exit -1 |
