* [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
@ 2025-01-20 16:43 Nico Boehr
2025-01-21 8:58 ` Marc Hartmayer
0 siblings, 1 reply; 7+ messages in thread
From: Nico Boehr @ 2025-01-20 16:43 UTC (permalink / raw)
To: frankja, imbrenda, thuth; +Cc: kvm, linux-s390
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
2025-01-20 16:43 Nico Boehr
@ 2025-01-21 8:58 ` Marc Hartmayer
0 siblings, 0 replies; 7+ messages in thread
From: Marc Hartmayer @ 2025-01-21 8:58 UTC (permalink / raw)
To: Nico Boehr, frankja, imbrenda, thuth; +Cc: kvm, linux-s390
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>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
@ 2025-02-27 13:10 Nico Boehr
2025-02-27 13:15 ` Marc Hartmayer
2025-03-10 12:20 ` Janosch Frank
0 siblings, 2 replies; 7+ messages in thread
From: Nico Boehr @ 2025-02-27 13:10 UTC (permalink / raw)
To: frankja, imbrenda, thuth; +Cc: kvm, linux-s390
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 47dda6d26a6f..97ed0b473af5 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -213,7 +213,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) $(GENPROTIMG_DEFAULT_ARGS) --host-key-document $(HOST_KEY_DOCUMENT) $(GENPROTIMG_COMM_OPTION) $(comm-key) --x-pcf $(GENPROTIMG_PCF) $(parmfile_args) --image $(filter %.bin,$^) -o $@
--
2.47.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
2025-02-27 13:10 [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds Nico Boehr
@ 2025-02-27 13:15 ` Marc Hartmayer
2025-03-10 12:20 ` Janosch Frank
1 sibling, 0 replies; 7+ messages in thread
From: Marc Hartmayer @ 2025-02-27 13:15 UTC (permalink / raw)
To: Nico Boehr, frankja, imbrenda, thuth; +Cc: kvm, linux-s390
On Thu, Feb 27, 2025 at 02:10 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 47dda6d26a6f..97ed0b473af5 100644
> --- a/s390x/Makefile
> +++ b/s390x/Makefile
> @@ -213,7 +213,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) $(GENPROTIMG_DEFAULT_ARGS) --host-key-document $(HOST_KEY_DOCUMENT) $(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>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
2025-02-27 13:10 [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds Nico Boehr
2025-02-27 13:15 ` Marc Hartmayer
@ 2025-03-10 12:20 ` Janosch Frank
2025-03-10 12:38 ` Marc Hartmayer
2025-03-11 9:03 ` Nico Boehr
1 sibling, 2 replies; 7+ messages in thread
From: Janosch Frank @ 2025-03-10 12:20 UTC (permalink / raw)
To: Nico Boehr, imbrenda, thuth; +Cc: kvm, linux-s390
On 2/27/25 2:10 PM, Nico Boehr 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 47dda6d26a6f..97ed0b473af5 100644
> --- a/s390x/Makefile
> +++ b/s390x/Makefile
> @@ -213,7 +213,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) $(GENPROTIMG_DEFAULT_ARGS) --host-key-document $(HOST_KEY_DOCUMENT) $(GENPROTIMG_COMM_OPTION) $(comm-key) --x-pcf $(GENPROTIMG_PCF) $(parmfile_args) --image $(filter %.bin,$^) -o $@
We had this hardcoded, then changed to this rule and now move back to
hardcoding, no?
It's fine but it's still strange...
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
2025-03-10 12:20 ` Janosch Frank
@ 2025-03-10 12:38 ` Marc Hartmayer
2025-03-11 9:03 ` Nico Boehr
1 sibling, 0 replies; 7+ messages in thread
From: Marc Hartmayer @ 2025-03-10 12:38 UTC (permalink / raw)
To: Janosch Frank, Nico Boehr, imbrenda, thuth; +Cc: kvm, linux-s390
On Mon, Mar 10, 2025 at 01:20 PM +0100, Janosch Frank <frankja@linux.ibm.com> wrote:
> On 2/27/25 2:10 PM, Nico Boehr 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 47dda6d26a6f..97ed0b473af5 100644
>> --- a/s390x/Makefile
>> +++ b/s390x/Makefile
>> @@ -213,7 +213,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) $(GENPROTIMG_DEFAULT_ARGS) --host-key-document $(HOST_KEY_DOCUMENT) $(GENPROTIMG_COMM_OPTION) $(comm-key) --x-pcf $(GENPROTIMG_PCF) $(parmfile_args) --image $(filter %.bin,$^) -o $@
>
>
> We had this hardcoded, then changed to this rule and now move back to
> hardcoding, no?
We probably have never tried to build KUT out-of-tree.
[…snip…]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds
2025-03-10 12:20 ` Janosch Frank
2025-03-10 12:38 ` Marc Hartmayer
@ 2025-03-11 9:03 ` Nico Boehr
1 sibling, 0 replies; 7+ messages in thread
From: Nico Boehr @ 2025-03-11 9:03 UTC (permalink / raw)
To: Janosch Frank, imbrenda, thuth; +Cc: kvm, linux-s390
On Mon Mar 10, 2025 at 1:20 PM CET, Janosch Frank wrote:
> On 2/27/25 2:10 PM, Nico Boehr 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 47dda6d26a6f..97ed0b473af5 100644
>> --- a/s390x/Makefile
>> +++ b/s390x/Makefile
>> @@ -213,7 +213,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) $(GENPROTIMG_DEFAULT_ARGS) --host-key-document $(HOST_KEY_DOCUMENT) $(GENPROTIMG_COMM_OPTION) $(comm-key) --x-pcf $(GENPROTIMG_PCF) $(parmfile_args) --image $(filter %.bin,$^) -o $@
>
>
> We had this hardcoded, then changed to this rule and now move back to
> hardcoding, no?
I mean the preferred way would be to not hardcode it _and_ have out of tree
builds working, but I (with my limited makefile knowledge) couldn't get this to
work properly. I will of course take patches... :-)
Since I had a unpleasant surprise with the upstream CI and out-of-tree-builds
recently, I thought it's acceptable to remove flexibility that nobody uses.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-03-11 9:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-27 13:10 [kvm-unit-tests PATCH v1] s390x: pv: fix arguments for out-of-tree-builds Nico Boehr
2025-02-27 13:15 ` Marc Hartmayer
2025-03-10 12:20 ` Janosch Frank
2025-03-10 12:38 ` Marc Hartmayer
2025-03-11 9:03 ` Nico Boehr
-- strict thread matches above, loose matches on Subject: below --
2025-01-20 16:43 Nico Boehr
2025-01-21 8:58 ` Marc Hartmayer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox