commit 02b26367615ba8c85d938cf7ba31e920b059e62a
author Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Mon Jan 04 10:13:25 2021 -0600
committer Klaus Heinrich Kiwi <klausk@br.ibm.com> Tue Jan 05 15:25:16 2021 -0300
tree a8c1d7721e40ad625d69d3aeeab488791721dbcb
parent b31c169f4c06ec2585549fce53e24486b4313cdc

MRW packages: Use explicit targetting XML name

Avoid collisions by specifying an explicit output file for the
processMrw.pl script.

Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>

openpower/package/everest-xml/everest-xml.mk

diff --git a/openpower/package/everest-xml/everest-xml.mk b/openpower/package/everest-xml/everest-xml.mk
index 29cdb8c..b6c369d 100644
--- a/openpower/package/everest-xml/everest-xml.mk
+++ b/openpower/package/everest-xml/everest-xml.mk
@@ -70,7 +70,8 @@
         # generate the system mrw xml
         perl -I $(EVEREST_XML_MRW_HB_TOOLS) \
         $(EVEREST_XML_MRW_HB_TOOLS)/processMrw.pl -x \
-            $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_FILENAME))
+            $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_FILENAME)) \
+            -o $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_TARGETING_FILENAME))
 
 	$(if $(BR2_EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES), $(call EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES))
 

openpower/package/machine-xml/machine-xml.mk

diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index 29170de..61070e3 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -71,7 +71,8 @@
 
         # generate the system mrw xml
         perl -I $(MRW_HB_TOOLS) \
-        $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/$(BR2_OPENPOWER_MACHINE_XML_FILENAME)
+        $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/$(BR2_OPENPOWER_MACHINE_XML_FILENAME) \
+        -o $(MRW_SCRATCH)/$(BR2_OPENPOWER_MRW_XML_FILENAME)$
 
 	$(if $(BR2_OPENPOWER_MACHINE_XML_FILTER_UNWANTED_ATTRIBUTES), $(call MACHINE_XML_FILTER_UNWANTED_ATTRIBUTES))
 

openpower/package/rainier-2u-xml/rainier-2u-xml.mk

diff --git a/openpower/package/rainier-2u-xml/rainier-2u-xml.mk b/openpower/package/rainier-2u-xml/rainier-2u-xml.mk
index 88bcaa6..9b07cde 100644
--- a/openpower/package/rainier-2u-xml/rainier-2u-xml.mk
+++ b/openpower/package/rainier-2u-xml/rainier-2u-xml.mk
@@ -70,7 +70,8 @@
         # generate the system mrw xml
         perl -I $(RAINIER_2U_XML_MRW_HB_TOOLS) \
         $(RAINIER_2U_XML_MRW_HB_TOOLS)/processMrw.pl -x \
-            $(call qstrip,$(RAINIER_2U_XML_MRW_SCRATCH)/$(BR2_RAINIER_2U_XML_FILENAME))
+            $(call qstrip,$(RAINIER_2U_XML_MRW_SCRATCH)/$(BR2_RAINIER_2U_XML_FILENAME)) \
+            -o $(call qstrip,$(RAINIER_2U_XML_MRW_SCRATCH)/$(BR2_RAINIER_2U_XML_TARGETING_FILENAME))$
 
 	$(if $(BR2_RAINIER_2U_XML_FILTER_UNWANTED_ATTRIBUTES), $(call RAINIER_2U_XML_FILTER_UNWANTED_ATTRIBUTES))
 

openpower/package/rainier-4u-xml/rainier-4u-xml.mk

diff --git a/openpower/package/rainier-4u-xml/rainier-4u-xml.mk b/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
index 9d1f6f7..abdb1eb 100644
--- a/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
+++ b/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
@@ -70,7 +70,8 @@
         # generate the system mrw xml
         perl -I $(RAINIER_4U_XML_MRW_HB_TOOLS) \
         $(RAINIER_4U_XML_MRW_HB_TOOLS)/processMrw.pl -x \
-            $(call qstrip,$(RAINIER_4U_XML_MRW_SCRATCH)/$(BR2_RAINIER_4U_XML_FILENAME))
+            $(call qstrip,$(RAINIER_4U_XML_MRW_SCRATCH)/$(BR2_RAINIER_4U_XML_FILENAME)) \
+            -o $(call qstrip,$(RAINIER_4U_XML_MRW_SCRATCH)/$(BR2_RAINIER_4U_XML_TARGETING_FILENAME))
 
 	$(if $(BR2_RAINIER_4U_XML_FILTER_UNWANTED_ATTRIBUTES), $(call RAINIER_4U_XML_FILTER_UNWANTED_ATTRIBUTES))