]> git.lttng.org Git - lttng-modules.git/commitdiff
Fix: powerpc builds with linux v6.13
authorKienan Stewart <kstewart@efficios.com>
Mon, 27 Jan 2025 16:48:32 +0000 (16:48 +0000)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 28 Jan 2025 18:57:13 +0000 (13:57 -0500)
The crtsavres.o object for powerpc is missing the $(objtree) prefix.
This can be worked-around by setting MO=$KERNELDIR and building in the
kernel tree as before this version.

See upstream commit:

    commit 214c0eea43b2ea66bcd6467ea57e47ce8874191b
    Author: Masahiro Yamada <masahiroy@kernel.org>
    Date:   Sun Nov 10 10:34:30 2024 +0900

        kbuild: add $(objtree)/ prefix to some in-kernel build artifacts

        $(objtree) refers to the top of the output directory of kernel builds.

        This commit adds the explicit $(objtree)/ prefix to build artifacts
        needed for building external modules.

        This change has no immediate impact, as the top-level Makefile
        currently defines:

          objtree         := .

        This commit prepares for supporting the building of external modules
        in a different directory.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Change-Id: I11f7ee1e7e5634e992953798e9ecef6b2558ff79
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Makefile

index 71aa496d6877d0dccdc3473623b7d6232b303794..6eae866ba4559dcd14fa34ecc56b11288db47b0a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,18 @@ ifeq ($(CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM),y)
 LKCPPFLAGS += -DCONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM=y
 endif
 
+# Work-around for crtsavres.o missing $(objtree) prefix on powerpc
+ifeq ($(ARCH),powerpc)
+MO ?= $(KERNELDIR)
+MO_OPT = MO=$(MO)
+endif
+
 default: modules
 
 modules:
        $(MAKE) -C $(KERNELDIR) M=$(PWD)/src \
                CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m \
-               KCPPFLAGS='$(LKCPPFLAGS)' \
+               KCPPFLAGS='$(LKCPPFLAGS)' $(MO_OPT) \
                modules
 
 syscalls_extractor:
This page took 0.031263 seconds and 4 git commands to generate.