2023-03-16 11:28:21

by Jiri Slaby

Subject: [PATCH] s390: reintroduce expoline dependence to scripts

Expolines depend on scripts/basic/fixdep. And build of expolines can now
race with the fixdep build:

make[1]: *** Deleting file 'arch/s390/lib/expoline/expoline.o'
/bin/sh: line 1: scripts/basic/fixdep: Permission denied
make[1]: *** [../scripts/Makefile.build:385: arch/s390/lib/expoline/expoline.o] Error 126
make: *** [../arch/s390/Makefile:166: expoline_prepare] Error 2

The dependence was removed in the below Fixes: commit. So reintroduce
the dependence on scripts.

Fixes: a0b0987a7811 ("s390/nospec: remove unneeded header includes")
Cc: Joe Lawrence <[email protected]>
Cc: [email protected]
Cc: Heiko Carstens <[email protected]>
Cc: Vasily Gorbik <[email protected]>
Cc: Alexander Gordeev <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: Sven Schnelle <[email protected]>
Cc: [email protected]
Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
---
arch/s390/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index b3235ab0ace8..ed646c583e4f 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -162,7 +162,7 @@ vdso_prepare: prepare0

ifdef CONFIG_EXPOLINE_EXTERN
modules_prepare: expoline_prepare
-expoline_prepare:
+expoline_prepare: scripts
$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
endif
endif
--
2.40.0

2023-03-21 21:19:26

by Vasily Gorbik

Subject: Re: [PATCH] s390: reintroduce expoline dependence to scripts

On Thu, Mar 16, 2023 at 12:28:09PM +0100, Jiri Slaby (SUSE) wrote:
> Expolines depend on scripts/basic/fixdep. And build of expolines can now
> race with the fixdep build:
>
> make[1]: *** Deleting file 'arch/s390/lib/expoline/expoline.o'
> /bin/sh: line 1: scripts/basic/fixdep: Permission denied
> make[1]: *** [../scripts/Makefile.build:385: arch/s390/lib/expoline/expoline.o] Error 126
> make: *** [../arch/s390/Makefile:166: expoline_prepare] Error 2
>
> The dependence was removed in the below Fixes: commit. So reintroduce
> the dependence on scripts.
>
> Fixes: a0b0987a7811 ("s390/nospec: remove unneeded header includes")
> Cc: Joe Lawrence <[email protected]>
> Cc: [email protected]
> Cc: Heiko Carstens <[email protected]>
> Cc: Vasily Gorbik <[email protected]>
> Cc: Alexander Gordeev <[email protected]>
> Cc: Christian Borntraeger <[email protected]>
> Cc: Sven Schnelle <[email protected]>
> Cc: [email protected]
> Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
> ---
> arch/s390/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/Makefile b/arch/s390/Makefile
> index b3235ab0ace8..ed646c583e4f 100644
> --- a/arch/s390/Makefile
> +++ b/arch/s390/Makefile
> @@ -162,7 +162,7 @@ vdso_prepare: prepare0
>
> ifdef CONFIG_EXPOLINE_EXTERN
> modules_prepare: expoline_prepare
> -expoline_prepare:
> +expoline_prepare: scripts
> $(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
> endif
> endif
> --

Applied, thank you.