Skip to contentSkip to conversation

s390x: pv: fix arguments for out-of-tree-builds

PATCH In review Nico Boehr 2 participants 2 messages Jan 20, 2025 – Jan 21, 2025

Subsystems (2)
lore
Share & tools
lore

Nico Boehr

author
#0 lore raw

PATCH 1/1 s390x: pv: fix arguments for out-of-tree-builds

When building out-of-tree, the parmfile was not passed to genprotimg, causing the selftest-setup_PV test to fail.

Fix the Makefile rule s.t. parmfile is correctly passed.

---
 s390x/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/Makefile +1 -1
index 23342bd64f44..a6cf3c144fbf 100644
@@ -218,7 +218,7 @@ else
 	GENPROTIMG_PCF := 0x000000e0
 endif
 
-$(patsubst %.parmfile,%.pv.bin,$(wildcard s390x/*.parmfile)): %.pv.bin: %.parmfile
+$(TEST_DIR)/selftest.pv.bin: $(SRCDIR)/s390x/selftest.parmfile
 %.pv.bin: %.bin $(HOST_KEY_DOCUMENT) $(comm-key)
 	$(eval parmfile_args = $(if $(filter %.parmfile,$^),--parmfile $(filter %.parmfile,$^),))
 	$(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify $(GENPROTIMG_COMM_OPTION) $(comm-key) --x-pcf $(GENPROTIMG_PCF) $(parmfile_args) --image $(filter %.bin,$^) -o $@
Signature · 1 line
2.47.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 26 lines · Nico Boehr

When building out-of-tree, the parmfile was not passed to genprotimg, causing the selftest-setup_PV test to fail.

Fix the Makefile rule s.t. parmfile is correctly passed.

---
 s390x/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/Makefile +1 -1
index 23342bd64f44..a6cf3c144fbf 100644
@@ -218,7 +218,7 @@ else
 	GENPROTIMG_PCF := 0x000000e0
 endif
 
-$(patsubst %.parmfile,%.pv.bin,$(wildcard s390x/*.parmfile)): %.pv.bin: %.parmfile
+$(TEST_DIR)/selftest.pv.bin: $(SRCDIR)/s390x/selftest.parmfile
 %.pv.bin: %.bin $(HOST_KEY_DOCUMENT) $(comm-key)
 	$(eval parmfile_args = $(if $(filter %.parmfile,$^),--parmfile $(filter %.parmfile,$^),))
 	$(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify $(GENPROTIMG_COMM_OPTION) $(comm-key) --x-pcf $(GENPROTIMG_PCF) $(parmfile_args) --image $(filter %.bin,$^) -o $@
Signature · 1 line
2.47.1