diff mbox series

kbuild: fix single *.ko build

Message ID 20230101060709.208512-1-masahiroy@kernel.org
State New
Headers
Series kbuild: fix single *.ko build |

Commit Message

Masahiro Yamada Jan. 1, 2023, 6:07 a.m. UTC 
  The single *.ko build is broken since commit f65a486821cf ("kbuild:
change module.order to list *.o instead of *.ko").

Fixes: f65a486821cf ("kbuild: change module.order to list *.o instead of *.ko")
Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sedat Dilek Jan. 1, 2023, 4:35 p.m. UTC | #1 
On Sun, Jan 1, 2023 at 7:19 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The single *.ko build is broken since commit f65a486821cf ("kbuild:
> change module.order to list *.o instead of *.ko").
>

Happy new 2023,

will this go into kbuild.git#fixes?

Thanks.

Regards,
-Sedat-

> Fixes: f65a486821cf ("kbuild: change module.order to list *.o instead of *.ko")
> Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 7cfbf3d15466..a0536633cdf6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1989,7 +1989,7 @@ $(single-no-ko): $(build-dir)
>  # Remove MODORDER when done because it is not the real one.
>  PHONY += single_modules
>  single_modules: $(single-no-ko) modules_prepare
> -       $(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$m;) } > $(MODORDER)
> +       $(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$(m:%.ko=%.o);) } > $(MODORDER)
>         $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
>  ifneq ($(KBUILD_MODPOST_NOFINAL),1)
>         $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal
> --
> 2.34.1
>
Marc Kleine-Budde Jan. 2, 2023, 11:22 a.m. UTC | #2 
On 01.01.2023 15:07:09, Masahiro Yamada wrote:
> The single *.ko build is broken since commit f65a486821cf ("kbuild:
> change module.order to list *.o instead of *.ko").
> 
> Fixes: f65a486821cf ("kbuild: change module.order to list *.o instead of *.ko")
> Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>

regards,
Marc
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 7cfbf3d15466..a0536633cdf6 100644
--- a/Makefile
+++ b/Makefile
@@ -1989,7 +1989,7 @@  $(single-no-ko): $(build-dir)
 # Remove MODORDER when done because it is not the real one.
 PHONY += single_modules
 single_modules: $(single-no-ko) modules_prepare
-	$(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$m;) } > $(MODORDER)
+	$(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$(m:%.ko=%.o);) } > $(MODORDER)
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
 ifneq ($(KBUILD_MODPOST_NOFINAL),1)
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal