summaryrefslogtreecommitdiffstats
path: root/tools/build
diff options
context:
space:
mode:
authorRichard J. Knight <rjknight@us.ibm.com>2017-10-24 21:59:23 -0500
committerRichard J. Knight <rjknight@us.ibm.com>2017-10-26 07:31:16 -0500
commitfe29bbc44166f5319d1cfd5ca74aede3a9893363 (patch)
tree276e97edd94dd3fcf1276aa4fd098ecc5e6f82bc /tools/build
parentdcd886dc34a42fb80f046156f075d396c6467a63 (diff)
downloadtalos-hcode-fe29bbc44166f5319d1cfd5ca74aede3a9893363.tar.gz
talos-hcode-fe29bbc44166f5319d1cfd5ca74aede3a9893363.zip
Build tag not displayed in generated hw_image report file
-Udpate hw_image.mk to apply build tag before report is generated Change-Id: Idcc72eb03602d4fd28138cdb7c294d579a7d867b
Diffstat (limited to 'tools/build')
-rw-r--r--tools/build/common.dir/order.final.mk11
1 files changed, 1 insertions, 10 deletions
diff --git a/tools/build/common.dir/order.final.mk b/tools/build/common.dir/order.final.mk
index e98c1460..605f4cb1 100644
--- a/tools/build/common.dir/order.final.mk
+++ b/tools/build/common.dir/order.final.mk
@@ -30,7 +30,6 @@
# * 'IMAGE' where images are built.
# * 'ALL' for everything else, like documentation.
-HW_IMAGE_VERSION = $(shell cat $(ROOTPATH)/../tools/build/release_tag.txt)
.PHONY: _BUILD/GEN_TARGETS _BUILD/GEN_TARGETS/ACT
_BUILD/GEN_TARGETS:
@@ -53,14 +52,6 @@ _BUILD/IMAGE_TARGETS: _BUILD/EXE_TARGETS | $(IMAGE_DEPS)
_BUILD/IMAGE_TARGETS/ACT: $(IMAGE_TARGETS) suppress_nothing_to_do
.PHONY: all _BUILD/ALL_TARGETS/ACT
-all: _BUILD/IMAGE_TARGETS install_rings
+all: _BUILD/IMAGE_TARGETS
@$(MAKE) _BUILD/ALL_TARGETS/ACT
- $(EXEPATH)/p9_xip_tool.exe $(IMAGEPATH)/hw_image/p9n.hw_image.bin set build_tag $(HW_IMAGE_VERSION)
_BUILD/ALL_TARGETS/ACT: $(ALL_TARGETS) suppress_nothing_to_do
-
-
-.PHONY: install_rings
-
-install_rings:
- @mkdir -p $(GENPATH)/rings/hw/
- @cp $(BASEPATH)/rings/* $(GENPATH)/rings/hw/
OpenPOWER on IntegriCloud