| Message ID | 20250120164400.2261408-1-nrb@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [kvm-unit-tests,v1] s390x: pv: fix arguments for out-of-tree-builds | expand |
On Mon, Jan 20, 2025 at 05:43 PM +0100, Nico Boehr <nrb@linux.ibm.com> wrote: > 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. > > Suggested-by: Marc Hartmayer <mhartmay@linux.ibm.com> > Signed-off-by: Nico Boehr <nrb@linux.ibm.com> > --- > s390x/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/s390x/Makefile b/s390x/Makefile > index 23342bd64f44..a6cf3c144fbf 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -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 $@ > -- > 2.47.1 Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
diff --git a/s390x/Makefile b/s390x/Makefile index 23342bd64f44..a6cf3c144fbf 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -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 $@
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. Suggested-by: Marc Hartmayer <mhartmay@linux.ibm.com> Signed-off-by: Nico Boehr <nrb@linux.ibm.com> --- s390x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)