diff options
author | Bill Hoffa <wghoffa@us.ibm.com> | 2014-06-26 10:36:51 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-06-27 15:00:23 -0500 |
commit | 21da53d274f5478ae7ac876f60460fe52166acc6 (patch) | |
tree | af03fda66b146c36870ba11ab63dfe7db30de512 | |
parent | 98d732a527edc1a422f0f185558a38505a68e74b (diff) | |
download | talos-hostboot-21da53d274f5478ae7ac876f60460fe52166acc6.tar.gz talos-hostboot-21da53d274f5478ae7ac876f60460fe52166acc6.zip |
HbDistribute related updates for openpower buildroot tooling
Change-Id: I8a35f683c45874431ddddda6fcf1a9a9cb471f3e
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11826
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r-- | src/build/mkrules/dist.targets.mk | 8 | ||||
-rwxr-xr-x | src/build/tools/hbDistribute | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk index 19323510d..d54d3d734 100644 --- a/src/build/mkrules/dist.targets.mk +++ b/src/build/mkrules/dist.targets.mk @@ -64,10 +64,18 @@ COPY_FILES = \ obj/genfiles/fapiAttrInfo.csv:vpo \ obj/genfiles/fapiAttrEnumInfo.csv:vpo \ obj/genfiles/targAttrInfo.csv:vpo \ + obj/genfiles/target_types_merged.xml:openpower \ + obj/genfiles/fapiattrs.xml:openpower \ src/build/hwpf/prcd_compile.tcl:tools \ src/usr/hwpf/hwp/initfiles/sample.initfile:tools \ src/build/buildpnor/buildSbePart.pl:openpower \ src/build/buildpnor/buildpnor.pl:openpower \ + src/usr/targeting/common/xmltohb/mergexml.sh:openpower \ + src/usr/targeting/common/xmltohb/attribute_types.xml:openpower \ + src/usr/targeting/common/xmltohb/attribute_types_hb.xml:openpower \ + src/usr/targeting/common/xmltohb/target_types_hb.xml:openpower \ + src/usr/targeting/common/xmltohb/xmltohb.pl:openpower \ + src/include/usr/vmmconst.h:openpower \ $(foreach file, $(call ROOTPATH_WILDCARD,releaseNotes.html), $(file):fsp)\ # diff --git a/src/build/tools/hbDistribute b/src/build/tools/hbDistribute index 0dd06c51e..d3c07daed 100755 --- a/src/build/tools/hbDistribute +++ b/src/build/tools/hbDistribute @@ -104,10 +104,14 @@ if [ "${TARGET_DIR}" == "invalid directory" ]; then fi # Find root of repository. -REPO_ROOT=`git rev-parse --show-toplevel` -if [ -z $REPO_ROOT ]; then - echo "ERROR: Not in a git repo." - exit +if [ -e "src/build/tools/hbDistribute" ]; then + REPO_ROOT="./" +else + REPO_ROOT=`git rev-parse --show-toplevel` + if [ -z $REPO_ROOT ]; then + echo "ERROR: Not in a git repo." + exit + fi fi # Execute makefile for distribution. |