commit 851e4c3c58abc3b058a1d89257081a1f73a7307d
author Robert Lippert <rlippert@google.com> Mon Dec 19 12:31:25 2016 -0800
committer Robert Lippert <rlippert@google.com> Mon Jan 09 11:45:11 2017 -0800
tree 4eaafbd7d617ec2b2ba4e525deed1ccbab308790
parent 1a78268ee5f55282614cc27b290f140b0a7ce9b7

Update zaius-xml package to latest version.

Includes required changes to build script to filter out
unwanted attributes generated by serverwiz.

Signed-off-by: Robert Lippert <rlippert@google.com>

openpower/package/zaius-xml/zaius.mk

diff --git a/openpower/package/zaius-xml/zaius.mk b/openpower/package/zaius-xml/zaius.mk
index 1da69aa..2d996fb 100644
--- a/openpower/package/zaius-xml/zaius.mk
+++ b/openpower/package/zaius-xml/zaius.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZAIUS_XML_VERSION ?= e0cc4f8f9d983dbc1b762ca4cb6e6b95eb88ab76
+ZAIUS_XML_VERSION ?= db53313f3873fc0a822121c0d95f257604387a76
 ZAIUS_XML_SITE ?= $(call github,rlippert,zaius-xml,$(ZAIUS_XML_VERSION))
 
 ZAIUS_XML_LICENSE = Apache-2.0
@@ -35,6 +35,18 @@
         perl -I $(MRW_HB_TOOLS) \
         $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/zaius.xml
 
+        # filter out unwanted attributes
+        chmod +x $(MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl
+
+        $(MRW_HB_TOOLS)/filter_out_unwanted_attributes.pl \
+            --tgt-xml $(MRW_HB_TOOLS)/target_types_merged.xml \
+            --tgt-xml $(MRW_HB_TOOLS)/target_types_hb.xml \
+            --tgt-xml $(MRW_HB_TOOLS)/target_types_oppowervm.xml \
+            --mrw-xml $(MRW_SCRATCH)/$(BR2_ZAIUS_MRW_XML_FILENAME)
+
+        cp $(MRW_SCRATCH)/$(BR2_ZAIUS_MRW_XML_FILENAME).updated \
+            $(MRW_SCRATCH)/$(BR2_ZAIUS_MRW_XML_FILENAME)
+
         # merge in any system specific attributes, hostboot attributes
         $(MRW_HB_TOOLS)/mergexml.sh $(MRW_SCRATCH)/$(BR2_ZAIUS_SYSTEM_XML_FILENAME) \
             $(MRW_HB_TOOLS)/attribute_types.xml \