From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 1 Sep 2022 10:23:34 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.9.327~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81685902b7ed1c24e851827c4214cd57a0defba1;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	kbuild-fix-include-path-in-scripts-makefile.modpost.patch
---

diff --git a/queue-5.15/kbuild-fix-include-path-in-scripts-makefile.modpost.patch b/queue-5.15/kbuild-fix-include-path-in-scripts-makefile.modpost.patch
new file mode 100644
index 00000000000..c610ab93774
--- /dev/null
+++ b/queue-5.15/kbuild-fix-include-path-in-scripts-makefile.modpost.patch
@@ -0,0 +1,43 @@
+From 23a0cb8e3225122496bfa79172005c587c2d64bf Mon Sep 17 00:00:00 2001
+From: Jing Leng <jleng@ambarella.com>
+Date: Tue, 17 May 2022 18:51:28 +0800
+Subject: kbuild: Fix include path in scripts/Makefile.modpost
+
+From: Jing Leng <jleng@ambarella.com>
+
+commit 23a0cb8e3225122496bfa79172005c587c2d64bf upstream.
+
+When building an external module, if users don't need to separate the
+compilation output and source code, they run the following command:
+"make -C $(LINUX_SRC_DIR) M=$(PWD)". At this point, "$(KBUILD_EXTMOD)"
+and "$(src)" are the same.
+
+If they need to separate them, they run "make -C $(KERNEL_SRC_DIR)
+O=$(KERNEL_OUT_DIR) M=$(OUT_DIR) src=$(PWD)". Before running the
+command, they need to copy "Kbuild" or "Makefile" to "$(OUT_DIR)" to
+prevent compilation failure.
+
+So the kernel should change the included path to avoid the copy operation.
+
+Signed-off-by: Jing Leng <jleng@ambarella.com>
+[masahiro: I do not think "M=$(OUT_DIR) src=$(PWD)" is the official way,
+but this patch is a nice clean up anyway.]
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Nicolas Schier <n.schier@avm.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/Makefile.modpost |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/scripts/Makefile.modpost
++++ b/scripts/Makefile.modpost
+@@ -87,8 +87,7 @@ obj := $(KBUILD_EXTMOD)
+ src := $(obj)
+ 
+ # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
+-include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
+-             $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
++include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
+ 
+ # modpost option for external modules
+ MODPOST += -e
diff --git a/queue-5.15/series b/queue-5.15/series
index 42105febf2c..be2b4d2cc1a 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -21,3 +21,4 @@ io_uring-bump-poll-refs-to-full-31-bits.patch
 io_uring-fail-links-when-poll-fails.patch
 io_uring-fix-wrong-arm_poll-error-handling.patch
 io_uring-fix-uaf-due-to-missing-pollfree-handling.patch
+kbuild-fix-include-path-in-scripts-makefile.modpost.patch