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
Delegated to: BPF
Headers show
Series [bpf] selftests/bpf: fix pkg-config call building sign-file | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 18 this patch: 18
netdev/cc_maintainers success CCed 16 of 16 maintainers
netdev/build_clang success Errors and warnings before: 18 this patch: 18
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 18 this patch: 18
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-10 success Logs for test_maps on s390x with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for test_maps on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-11 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-12 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-13 fail Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-16 fail Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-18 fail Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-21 fail Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-23 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for test_progs_no_alu32_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-25 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-27 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-28 success Logs for test_progs_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-29 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-30 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-31 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-32 success Logs for test_verifier on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-34 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-35 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-36 success Logs for veristat
bpf/vmtest-bpf-VM_Test-14 fail Logs for test_progs on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-17 fail Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-19 fail Logs for test_progs_no_alu32 on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-22 fail Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-15 fail Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-33 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-20 fail Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-1 success Logs for ${{ matrix.test }} on ${{ matrix.arch }} with ${{ matrix.toolchain_full }}
bpf/vmtest-bpf-VM_Test-2 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-3 success Logs for build for aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-4 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-5 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-6 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-7 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-8 success Logs for veristat

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)