diff mbox series

[bpf] selftests/bpf: fix pkg-config call building sign-file

Message ID 20230426215032.415792-1-jeremy@azazel.net (mailing list archive)
State Accepted
Commit 5f5486b620cd43b16a1787ef92b9bc21bd72ef2e
Headers show
Series [bpf] selftests/bpf: fix pkg-config call building sign-file | expand

Commit Message

Jeremy Sowden April 26, 2023, 9:50 p.m. UTC
When building sign-file, the call to get the CFLAGS for libcrypto is
missing white-space between `pkg-config` and `--cflags`:

  $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null)

Removing the redirection of stderr, we see:

  $ make -C tools/testing/selftests/bpf sign-file
  make: Entering directory '[...]/tools/testing/selftests/bpf'
  make: pkg-config--cflags: No such file or directory
    SIGN-FILE sign-file
  make: Leaving directory '[...]/tools/testing/selftests/bpf'

Add the missing space.

Fixes: fc97590668ae ("selftests/bpf: Add test for bpf_verify_pkcs7_signature() kfunc")
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 tools/testing/selftests/bpf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Roberto Sassu April 27, 2023, 6:52 a.m. UTC | #1
On Wed, 2023-04-26 at 22:50 +0100, Jeremy Sowden wrote:
> When building sign-file, the call to get the CFLAGS for libcrypto is
> missing white-space between `pkg-config` and `--cflags`:
> 
>   $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null)
> 
> Removing the redirection of stderr, we see:
> 
>   $ make -C tools/testing/selftests/bpf sign-file
>   make: Entering directory '[...]/tools/testing/selftests/bpf'
>   make: pkg-config--cflags: No such file or directory
>     SIGN-FILE sign-file
>   make: Leaving directory '[...]/tools/testing/selftests/bpf'
> 
> Add the missing space.
> 
> Fixes: fc97590668ae ("selftests/bpf: Add test for bpf_verify_pkcs7_signature() kfunc")
> Signed-off-by: Jeremy Sowden <jeremy@azazel.net>

Thanks.

Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com>

Roberto

> ---
>  tools/testing/selftests/bpf/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index b677dcd0b77a..ad01c9e1ff12 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -197,7 +197,7 @@ $(OUTPUT)/urandom_read: urandom_read.c urandom_read_aux.c $(OUTPUT)/liburandom_r
>  
>  $(OUTPUT)/sign-file: ../../../../scripts/sign-file.c
>  	$(call msg,SIGN-FILE,,$@)
> -	$(Q)$(CC) $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null) \
> +	$(Q)$(CC) $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) \
>  		  $< -o $@ \
>  		  $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
>
Jeremy Sowden April 27, 2023, 7:58 p.m. UTC | #2
On 2023-04-27, at 08:52:27 +0200, Roberto Sassu wrote:
> On Wed, 2023-04-26 at 22:50 +0100, Jeremy Sowden wrote:
> > When building sign-file, the call to get the CFLAGS for libcrypto is
> > missing white-space between `pkg-config` and `--cflags`:
> > 
> >   $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null)
> > 
> > Removing the redirection of stderr, we see:
> > 
> >   $ make -C tools/testing/selftests/bpf sign-file
> >   make: Entering directory '[...]/tools/testing/selftests/bpf'
> >   make: pkg-config--cflags: No such file or directory
> >     SIGN-FILE sign-file
> >   make: Leaving directory '[...]/tools/testing/selftests/bpf'
> > 
> > Add the missing space.
> > 
> > Fixes: fc97590668ae ("selftests/bpf: Add test for bpf_verify_pkcs7_signature() kfunc")
> > Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> 
> Thanks.
> 
> Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com>
>
> Roberto

Thanks.  I was having e-mail problems yesterday when I sent the original
message with the patch in it, and it didn't reach some of the
recipients.  I'll send it again with your `Reviewed-by:` attached.

J.

> > ---
> >  tools/testing/selftests/bpf/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> > index b677dcd0b77a..ad01c9e1ff12 100644
> > --- a/tools/testing/selftests/bpf/Makefile
> > +++ b/tools/testing/selftests/bpf/Makefile
> > @@ -197,7 +197,7 @@ $(OUTPUT)/urandom_read: urandom_read.c urandom_read_aux.c $(OUTPUT)/liburandom_r
> >  
> >  $(OUTPUT)/sign-file: ../../../../scripts/sign-file.c
> >  	$(call msg,SIGN-FILE,,$@)
> > -	$(Q)$(CC) $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null) \
> > +	$(Q)$(CC) $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) \
> >  		  $< -o $@ \
> >  		  $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
> >
Daniel Borkmann April 27, 2023, 8:04 p.m. UTC | #3
On 4/27/23 9:58 PM, Jeremy Sowden wrote:
> On 2023-04-27, at 08:52:27 +0200, Roberto Sassu wrote:
>> On Wed, 2023-04-26 at 22:50 +0100, Jeremy Sowden wrote:
>>> When building sign-file, the call to get the CFLAGS for libcrypto is
>>> missing white-space between `pkg-config` and `--cflags`:
>>>
>>>    $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null)
>>>
>>> Removing the redirection of stderr, we see:
>>>
>>>    $ make -C tools/testing/selftests/bpf sign-file
>>>    make: Entering directory '[...]/tools/testing/selftests/bpf'
>>>    make: pkg-config--cflags: No such file or directory
>>>      SIGN-FILE sign-file
>>>    make: Leaving directory '[...]/tools/testing/selftests/bpf'
>>>
>>> Add the missing space.
>>>
>>> Fixes: fc97590668ae ("selftests/bpf: Add test for bpf_verify_pkcs7_signature() kfunc")
>>> Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
>>
>> Thanks.
>>
>> Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com>
>>
>> Roberto
> 
> Thanks.  I was having e-mail problems yesterday when I sent the original
> message with the patch in it, and it didn't reach some of the
> recipients.  I'll send it again with your `Reviewed-by:` attached.

No need, already took it, thanks. Looks like patchbot did not reply. :/

https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=415d7a49cd796a11cfbeaa360b13721bba5117bb
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index b677dcd0b77a..ad01c9e1ff12 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -197,7 +197,7 @@  $(OUTPUT)/urandom_read: urandom_read.c urandom_read_aux.c $(OUTPUT)/liburandom_r
 
 $(OUTPUT)/sign-file: ../../../../scripts/sign-file.c
 	$(call msg,SIGN-FILE,,$@)
-	$(Q)$(CC) $(shell $(HOSTPKG_CONFIG)--cflags libcrypto 2> /dev/null) \
+	$(Q)$(CC) $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) \
 		  $< -o $@ \
 		  $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)