s390: reintroduce expoline dependence to scripts

[PATCH] s390: reintroduce expoline dependence to scripts

Posted by Jiri Slaby (SUSE) 2 years, 11 months ago

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 <joe.lawrence@redhat.com>
Cc: stable@vger.kernel.org
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 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

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

Posted by Vasily Gorbik 2 years, 10 months ago

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 <joe.lawrence@redhat.com>
> Cc: stable@vger.kernel.org
> Cc: Heiko Carstens <hca@linux.ibm.com>
> Cc: Vasily Gorbik <gor@linux.ibm.com>
> Cc: Alexander Gordeev <agordeev@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
> Cc: Sven Schnelle <svens@linux.ibm.com>
> Cc: linux-s390@vger.kernel.org
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> ---
>  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.