Re: linux-next: build failure after merge of the powerpc tree

[Masahiro Yamada]

On Mon, Sep 9, 2024 at 11:58 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Christophe,
>
> On Mon, 9 Sep 2024 16:22:26 +0200 Christophe Leroy <christophe.leroy@xxxxxxxxxx> wrote:
> >
> > Le 09/09/2024 à 12:09, Stephen Rothwell a écrit :
> > > Hi all,
> > >
> > > After merging the powerpc tree, today's linux-next build (powerpc
> > > ppc44x_defconfig) failed like this:
> > >
> > > make[3]: *** No rule to make target 'arch/powerpc/boot/treeImage.ebony', needed by 'arch/powerpc/boot/zImage'.  Stop.
> > > make[2]: *** [/home/sfr/next/next/arch/powerpc/Makefile:236: zImage] Error 2
> > > make[1]: *** [/home/sfr/next/next/Makefile:224: __sub-make] Error 2
> > > make: *** [Makefile:224: __sub-make] Error 2
> > >
> > > It is not obvious to me what change caused this, so I have just left
> > > the build  broken for today.
> > >
> >
> > Bisected to commit e6abfb536d16 ("kbuild: split device tree build rules into scripts/Makefile.dtbs")
>
> Thanks for that.
>
> --
> Cheers,
> Stephen Rothwell


I squashed the following fix. Hopefully, it will be ok tomorrow.


diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 6385e7aa5dbb..8403eba15457 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -444,7 +444,7 @@ ifneq ($(userprogs),)
 include $(srctree)/scripts/Makefile.userprogs
 endif

-ifneq ($(need-dtbslist)$(dtb-y)$(dtb-)$(filter %.dtb.o %.dtbo.o,$(targets)),)
+ifneq ($(need-dtbslist)$(dtb-y)$(dtb-)$(filter %.dtb %.dtb.o
%.dtbo.o,$(targets)),)
 include $(srctree)/scripts/Makefile.dtbs
 endif


-- 
Best Regards
Masahiro Yamada