* [LTP] [PATCH] Makefile: Use M to build extern kernel module instead of SUBDIRS
@ 2021-04-07 6:12 Yang Xu
2021-04-07 7:25 ` yangx.jy
0 siblings, 1 reply; 6+ messages in thread
From: Yang Xu @ 2021-04-07 6:12 UTC (permalink / raw)
To: ltp
Since 5.3 kernel commit 7e35b42591c0 ("kbuild: remove SUBDIRS support"),
SUBDIRS has been removed. We can only use make M=dir or set the environment
variable KBUILD_EXTMOD to specify the directory of external module to build.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
.../kernel/device-drivers/agp/kernel_space/Makefile | 4 ++--
testcases/kernel/device-drivers/base/tbase/Makefile | 4 ++--
.../kernel/device-drivers/drm/kernel_space/Makefile | 2 +-
testcases/kernel/device-drivers/include/Makefile | 4 ++--
.../misc_modules/per_cpu_allocator_module/Makefile | 8 ++++----
testcases/kernel/device-drivers/nls/Makefile | 6 +++---
testcases/kernel/device-drivers/usb/tusb/Makefile | 10 +++++-----
.../kernel/device-drivers/v4l/kernel_space/Makefile | 8 ++++----
testcases/kernel/fs/scsi/ltpfs/Makefile | 4 ++--
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/testcases/kernel/device-drivers/agp/kernel_space/Makefile b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
index 5357c135e..5a10064f0 100644
--- a/testcases/kernel/device-drivers/agp/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
@@ -14,8 +14,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/base/tbase/Makefile b/testcases/kernel/device-drivers/base/tbase/Makefile
index 6f7e5e2c1..5e5a40e61 100644
--- a/testcases/kernel/device-drivers/base/tbase/Makefile
+++ b/testcases/kernel/device-drivers/base/tbase/Makefile
@@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/drm/kernel_space/Makefile b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
index 11e54d9be..24b768d76 100644
--- a/testcases/kernel/device-drivers/drm/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
@@ -11,7 +11,7 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/include/Makefile b/testcases/kernel/device-drivers/include/Makefile
index c9810ba5e..72d7293c2 100644
--- a/testcases/kernel/device-drivers/include/Makefile
+++ b/testcases/kernel/device-drivers/include/Makefile
@@ -13,9 +13,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
${CC} -Wall -o userBlockInclude userBlockInclude.c
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
index 3bc274dad..ae802f77c 100644
--- a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
+++ b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
@@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
modules:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
+ $(MAKE) -C $(KDIR) M=$(PWD) help
modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
endif
diff --git a/testcases/kernel/device-drivers/nls/Makefile b/testcases/kernel/device-drivers/nls/Makefile
index 172510fe8..a1fab20f8 100644
--- a/testcases/kernel/device-drivers/nls/Makefile
+++ b/testcases/kernel/device-drivers/nls/Makefile
@@ -12,12 +12,12 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
${CC} $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
rm -f userBlockNLS
diff --git a/testcases/kernel/device-drivers/usb/tusb/Makefile b/testcases/kernel/device-drivers/usb/tusb/Makefile
index 9488cd563..4dcbca36c 100644
--- a/testcases/kernel/device-drivers/usb/tusb/Makefile
+++ b/testcases/kernel/device-drivers/usb/tusb/Makefile
@@ -13,17 +13,17 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
+ $(MAKE) -C $(KDIR) M=$(PWD) help
modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
endif
diff --git a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
index 56e255b04..549c37d5c 100644
--- a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
@@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
modules:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
+ $(MAKE) -C $(KDIR) M=$(PWD) help
modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
endif
diff --git a/testcases/kernel/fs/scsi/ltpfs/Makefile b/testcases/kernel/fs/scsi/ltpfs/Makefile
index 7c46a4c4d..5f4030661 100644
--- a/testcases/kernel/fs/scsi/ltpfs/Makefile
+++ b/testcases/kernel/fs/scsi/ltpfs/Makefile
@@ -14,9 +14,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
${CC} $(CFLAGS) -o ltpfstest -lm main.c
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
--
2.30.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [LTP] [PATCH] Makefile: Use M to build extern kernel module instead of SUBDIRS
2021-04-07 6:12 [LTP] [PATCH] Makefile: Use M to build extern kernel module instead of SUBDIRS Yang Xu
@ 2021-04-07 7:25 ` yangx.jy
2021-04-07 7:55 ` xuyang2018.jy
2021-04-07 9:04 ` [LTP] [PATCH v2] " Yang Xu
0 siblings, 2 replies; 6+ messages in thread
From: yangx.jy @ 2021-04-07 7:25 UTC (permalink / raw)
To: ltp
On 2021/4/7 14:12, Yang Xu wrote:
> Since 5.3 kernel commit 7e35b42591c0 ("kbuild: remove SUBDIRS support"),
> SUBDIRS has been removed. We can only use make M=dir or set the environment
> variable KBUILD_EXTMOD to specify the directory of external module to build.
Hi Xu,
One missing Makefile:
testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
> Signed-off-by: Yang Xu<xuyang2018.jy@fujitsu.com>
> ---
> .../kernel/device-drivers/agp/kernel_space/Makefile | 4 ++--
> testcases/kernel/device-drivers/base/tbase/Makefile | 4 ++--
> .../kernel/device-drivers/drm/kernel_space/Makefile | 2 +-
> testcases/kernel/device-drivers/include/Makefile | 4 ++--
> .../misc_modules/per_cpu_allocator_module/Makefile | 8 ++++----
> testcases/kernel/device-drivers/nls/Makefile | 6 +++---
> testcases/kernel/device-drivers/usb/tusb/Makefile | 10 +++++-----
> .../kernel/device-drivers/v4l/kernel_space/Makefile | 8 ++++----
> testcases/kernel/fs/scsi/ltpfs/Makefile | 4 ++--
> 9 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/testcases/kernel/device-drivers/agp/kernel_space/Makefile b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
> index 5357c135e..5a10064f0 100644
> --- a/testcases/kernel/device-drivers/agp/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
> @@ -14,8 +14,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
Is it necessary to update these comments? In other words, could we
remove these comments directly?
Best Regards,
Xiao Yang
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/base/tbase/Makefile b/testcases/kernel/device-drivers/base/tbase/Makefile
> index 6f7e5e2c1..5e5a40e61 100644
> --- a/testcases/kernel/device-drivers/base/tbase/Makefile
> +++ b/testcases/kernel/device-drivers/base/tbase/Makefile
> @@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/drm/kernel_space/Makefile b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
> index 11e54d9be..24b768d76 100644
> --- a/testcases/kernel/device-drivers/drm/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
> @@ -11,7 +11,7 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/include/Makefile b/testcases/kernel/device-drivers/include/Makefile
> index c9810ba5e..72d7293c2 100644
> --- a/testcases/kernel/device-drivers/include/Makefile
> +++ b/testcases/kernel/device-drivers/include/Makefile
> @@ -13,9 +13,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> ${CC} -Wall -o userBlockInclude userBlockInclude.c
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
> index 3bc274dad..ae802f77c 100644
> --- a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
> +++ b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> modules:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
>
> help:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
> + $(MAKE) -C $(KDIR) M=$(PWD) help
>
> modules_install:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>
> endif
> diff --git a/testcases/kernel/device-drivers/nls/Makefile b/testcases/kernel/device-drivers/nls/Makefile
> index 172510fe8..a1fab20f8 100644
> --- a/testcases/kernel/device-drivers/nls/Makefile
> +++ b/testcases/kernel/device-drivers/nls/Makefile
> @@ -12,12 +12,12 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> ${CC} $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
> rm -f userBlockNLS
>
> diff --git a/testcases/kernel/device-drivers/usb/tusb/Makefile b/testcases/kernel/device-drivers/usb/tusb/Makefile
> index 9488cd563..4dcbca36c 100644
> --- a/testcases/kernel/device-drivers/usb/tusb/Makefile
> +++ b/testcases/kernel/device-drivers/usb/tusb/Makefile
> @@ -13,17 +13,17 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
>
> help:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
> + $(MAKE) -C $(KDIR) M=$(PWD) help
>
> modules_install:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>
> endif
> diff --git a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
> index 56e255b04..549c37d5c 100644
> --- a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> modules:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
>
> help:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
> + $(MAKE) -C $(KDIR) M=$(PWD) help
>
> modules_install:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>
> endif
> diff --git a/testcases/kernel/fs/scsi/ltpfs/Makefile b/testcases/kernel/fs/scsi/ltpfs/Makefile
> index 7c46a4c4d..5f4030661 100644
> --- a/testcases/kernel/fs/scsi/ltpfs/Makefile
> +++ b/testcases/kernel/fs/scsi/ltpfs/Makefile
> @@ -14,9 +14,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> ${CC} $(CFLAGS) -o ltpfstest -lm main.c
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
^ permalink raw reply [flat|nested] 6+ messages in thread* [LTP] [PATCH] Makefile: Use M to build extern kernel module instead of SUBDIRS
2021-04-07 7:25 ` yangx.jy
@ 2021-04-07 7:55 ` xuyang2018.jy
2021-04-07 9:04 ` [LTP] [PATCH v2] " Yang Xu
1 sibling, 0 replies; 6+ messages in thread
From: xuyang2018.jy @ 2021-04-07 7:55 UTC (permalink / raw)
To: ltp
Hi Xiao
> On 2021/4/7 14:12, Yang Xu wrote:
>> Since 5.3 kernel commit 7e35b42591c0 ("kbuild: remove SUBDIRS support"),
>> SUBDIRS has been removed. We can only use make M=dir or set the environment
>> variable KBUILD_EXTMOD to specify the directory of external module to build.
> Hi Xu,
>
> One missing Makefile:
> testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
Thanks for catching this. I will send a v2.
>
>> Signed-off-by: Yang Xu<xuyang2018.jy@fujitsu.com>
>> ---
>> .../kernel/device-drivers/agp/kernel_space/Makefile | 4 ++--
>> testcases/kernel/device-drivers/base/tbase/Makefile | 4 ++--
>> .../kernel/device-drivers/drm/kernel_space/Makefile | 2 +-
>> testcases/kernel/device-drivers/include/Makefile | 4 ++--
>> .../misc_modules/per_cpu_allocator_module/Makefile | 8 ++++----
>> testcases/kernel/device-drivers/nls/Makefile | 6 +++---
>> testcases/kernel/device-drivers/usb/tusb/Makefile | 10 +++++-----
>> .../kernel/device-drivers/v4l/kernel_space/Makefile | 8 ++++----
>> testcases/kernel/fs/scsi/ltpfs/Makefile | 4 ++--
>> 9 files changed, 25 insertions(+), 25 deletions(-)
>>
>> diff --git a/testcases/kernel/device-drivers/agp/kernel_space/Makefile b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
>> index 5357c135e..5a10064f0 100644
>> --- a/testcases/kernel/device-drivers/agp/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
>> @@ -14,8 +14,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>
> Is it necessary to update these comments? In other words, could we
> remove these comments directly?
These makefiles all have the following comment:
#
# Makefile for GCOV profiling kernel module
#
#KERNELDIR := /usr/src/linux-2.5.64-gcov
It maybe used to test kernel module coverage. I am not sure.
I guess we can remove them in a separate patch if they are useless after
discussion.
@cyril,petr,Li Do you have some advise for these comments?
Best Regards
Yang Xu
>
> Best Regards,
> Xiao Yang
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/base/tbase/Makefile b/testcases/kernel/device-drivers/base/tbase/Makefile
>> index 6f7e5e2c1..5e5a40e61 100644
>> --- a/testcases/kernel/device-drivers/base/tbase/Makefile
>> +++ b/testcases/kernel/device-drivers/base/tbase/Makefile
>> @@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/drm/kernel_space/Makefile b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
>> index 11e54d9be..24b768d76 100644
>> --- a/testcases/kernel/device-drivers/drm/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
>> @@ -11,7 +11,7 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/include/Makefile b/testcases/kernel/device-drivers/include/Makefile
>> index c9810ba5e..72d7293c2 100644
>> --- a/testcases/kernel/device-drivers/include/Makefile
>> +++ b/testcases/kernel/device-drivers/include/Makefile
>> @@ -13,9 +13,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> ${CC} -Wall -o userBlockInclude userBlockInclude.c
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
>> index 3bc274dad..ae802f77c 100644
>> --- a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
>> +++ b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
>> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> modules:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>>
>> help:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
>> + $(MAKE) -C $(KDIR) M=$(PWD) help
>>
>> modules_install:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>>
>> endif
>> diff --git a/testcases/kernel/device-drivers/nls/Makefile b/testcases/kernel/device-drivers/nls/Makefile
>> index 172510fe8..a1fab20f8 100644
>> --- a/testcases/kernel/device-drivers/nls/Makefile
>> +++ b/testcases/kernel/device-drivers/nls/Makefile
>> @@ -12,12 +12,12 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> ${CC} $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>> rm -f userBlockNLS
>>
>> diff --git a/testcases/kernel/device-drivers/usb/tusb/Makefile b/testcases/kernel/device-drivers/usb/tusb/Makefile
>> index 9488cd563..4dcbca36c 100644
>> --- a/testcases/kernel/device-drivers/usb/tusb/Makefile
>> +++ b/testcases/kernel/device-drivers/usb/tusb/Makefile
>> @@ -13,17 +13,17 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>>
>> help:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
>> + $(MAKE) -C $(KDIR) M=$(PWD) help
>>
>> modules_install:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>>
>> endif
>> diff --git a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
>> index 56e255b04..549c37d5c 100644
>> --- a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
>> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> modules:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>>
>> help:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
>> + $(MAKE) -C $(KDIR) M=$(PWD) help
>>
>> modules_install:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>>
>> endif
>> diff --git a/testcases/kernel/fs/scsi/ltpfs/Makefile b/testcases/kernel/fs/scsi/ltpfs/Makefile
>> index 7c46a4c4d..5f4030661 100644
>> --- a/testcases/kernel/fs/scsi/ltpfs/Makefile
>> +++ b/testcases/kernel/fs/scsi/ltpfs/Makefile
>> @@ -14,9 +14,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> ${CC} $(CFLAGS) -o ltpfstest -lm main.c
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
^ permalink raw reply [flat|nested] 6+ messages in thread* [LTP] [PATCH v2] Makefile: Use M to build extern kernel module instead of SUBDIRS
2021-04-07 7:25 ` yangx.jy
2021-04-07 7:55 ` xuyang2018.jy
@ 2021-04-07 9:04 ` Yang Xu
2021-04-07 8:30 ` yangx.jy
1 sibling, 1 reply; 6+ messages in thread
From: Yang Xu @ 2021-04-07 9:04 UTC (permalink / raw)
To: ltp
Since 5.3 kernel commit 7e35b42591c0 ("kbuild: remove SUBDIRS support"),
SUBDIRS has been removed. We can only use make M=dir or set the environment
variable KBUILD_EXTMOD to specify the directory of external module to build.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
v1->v2:
add mssing .../dev_sim_framework/kernel_space/Makefile
.../kernel/device-drivers/agp/kernel_space/Makefile | 4 ++--
testcases/kernel/device-drivers/base/tbase/Makefile | 4 ++--
.../dev_sim_framework/kernel_space/Makefile | 4 ++--
.../kernel/device-drivers/drm/kernel_space/Makefile | 2 +-
testcases/kernel/device-drivers/include/Makefile | 4 ++--
.../misc_modules/per_cpu_allocator_module/Makefile | 8 ++++----
testcases/kernel/device-drivers/nls/Makefile | 6 +++---
testcases/kernel/device-drivers/usb/tusb/Makefile | 10 +++++-----
.../kernel/device-drivers/v4l/kernel_space/Makefile | 8 ++++----
testcases/kernel/fs/scsi/ltpfs/Makefile | 4 ++--
10 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/testcases/kernel/device-drivers/agp/kernel_space/Makefile b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
index 5357c135e..5a10064f0 100644
--- a/testcases/kernel/device-drivers/agp/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
@@ -14,8 +14,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/base/tbase/Makefile b/testcases/kernel/device-drivers/base/tbase/Makefile
index 6f7e5e2c1..5e5a40e61 100644
--- a/testcases/kernel/device-drivers/base/tbase/Makefile
+++ b/testcases/kernel/device-drivers/base/tbase/Makefile
@@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
index e7e7be607..ccaf3f9ac 100644
--- a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
@@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/drm/kernel_space/Makefile b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
index 11e54d9be..24b768d76 100644
--- a/testcases/kernel/device-drivers/drm/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
@@ -11,7 +11,7 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/include/Makefile b/testcases/kernel/device-drivers/include/Makefile
index c9810ba5e..72d7293c2 100644
--- a/testcases/kernel/device-drivers/include/Makefile
+++ b/testcases/kernel/device-drivers/include/Makefile
@@ -13,9 +13,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
${CC} -Wall -o userBlockInclude userBlockInclude.c
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
diff --git a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
index 3bc274dad..ae802f77c 100644
--- a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
+++ b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
@@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
modules:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
+ $(MAKE) -C $(KDIR) M=$(PWD) help
modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
endif
diff --git a/testcases/kernel/device-drivers/nls/Makefile b/testcases/kernel/device-drivers/nls/Makefile
index 172510fe8..a1fab20f8 100644
--- a/testcases/kernel/device-drivers/nls/Makefile
+++ b/testcases/kernel/device-drivers/nls/Makefile
@@ -12,12 +12,12 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
${CC} $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
rm -f userBlockNLS
diff --git a/testcases/kernel/device-drivers/usb/tusb/Makefile b/testcases/kernel/device-drivers/usb/tusb/Makefile
index 9488cd563..4dcbca36c 100644
--- a/testcases/kernel/device-drivers/usb/tusb/Makefile
+++ b/testcases/kernel/device-drivers/usb/tusb/Makefile
@@ -13,17 +13,17 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
+ $(MAKE) -C $(KDIR) M=$(PWD) help
modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
endif
diff --git a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
index 56e255b04..549c37d5c 100644
--- a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
+++ b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
@@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
modules:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
+ $(MAKE) -C $(KDIR) M=$(PWD) clean
rm -f modules.order
help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
+ $(MAKE) -C $(KDIR) M=$(PWD) help
modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
endif
diff --git a/testcases/kernel/fs/scsi/ltpfs/Makefile b/testcases/kernel/fs/scsi/ltpfs/Makefile
index 7c46a4c4d..5f4030661 100644
--- a/testcases/kernel/fs/scsi/ltpfs/Makefile
+++ b/testcases/kernel/fs/scsi/ltpfs/Makefile
@@ -14,9 +14,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KDIR) M=$(PWD) modules
${CC} $(CFLAGS) -o ltpfstest -lm main.c
-# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
endif
clean:
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [LTP] [PATCH v2] Makefile: Use M to build extern kernel module instead of SUBDIRS
2021-04-07 9:04 ` [LTP] [PATCH v2] " Yang Xu
@ 2021-04-07 8:30 ` yangx.jy
2021-04-07 10:07 ` xuyang2018.jy
0 siblings, 1 reply; 6+ messages in thread
From: yangx.jy @ 2021-04-07 8:30 UTC (permalink / raw)
To: ltp
On 2021/4/7 17:04, Yang Xu wrote:
> Since 5.3 kernel commit 7e35b42591c0 ("kbuild: remove SUBDIRS support"),
> SUBDIRS has been removed. We can only use make M=dir or set the environment
> variable KBUILD_EXTMOD to specify the directory of external module to build.
>
Hi,
LGTM.
Reviewed-by: Xiao Yang <yangx.jy@fujitsu.com>
Best Regards,
Xiao Yang
> Signed-off-by: Yang Xu<xuyang2018.jy@fujitsu.com>
> ---
> v1->v2:
> add mssing .../dev_sim_framework/kernel_space/Makefile
> .../kernel/device-drivers/agp/kernel_space/Makefile | 4 ++--
> testcases/kernel/device-drivers/base/tbase/Makefile | 4 ++--
> .../dev_sim_framework/kernel_space/Makefile | 4 ++--
> .../kernel/device-drivers/drm/kernel_space/Makefile | 2 +-
> testcases/kernel/device-drivers/include/Makefile | 4 ++--
> .../misc_modules/per_cpu_allocator_module/Makefile | 8 ++++----
> testcases/kernel/device-drivers/nls/Makefile | 6 +++---
> testcases/kernel/device-drivers/usb/tusb/Makefile | 10 +++++-----
> .../kernel/device-drivers/v4l/kernel_space/Makefile | 8 ++++----
> testcases/kernel/fs/scsi/ltpfs/Makefile | 4 ++--
> 10 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/testcases/kernel/device-drivers/agp/kernel_space/Makefile b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
> index 5357c135e..5a10064f0 100644
> --- a/testcases/kernel/device-drivers/agp/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
> @@ -14,8 +14,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/base/tbase/Makefile b/testcases/kernel/device-drivers/base/tbase/Makefile
> index 6f7e5e2c1..5e5a40e61 100644
> --- a/testcases/kernel/device-drivers/base/tbase/Makefile
> +++ b/testcases/kernel/device-drivers/base/tbase/Makefile
> @@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
> index e7e7be607..ccaf3f9ac 100644
> --- a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
> @@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/drm/kernel_space/Makefile b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
> index 11e54d9be..24b768d76 100644
> --- a/testcases/kernel/device-drivers/drm/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
> @@ -11,7 +11,7 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/include/Makefile b/testcases/kernel/device-drivers/include/Makefile
> index c9810ba5e..72d7293c2 100644
> --- a/testcases/kernel/device-drivers/include/Makefile
> +++ b/testcases/kernel/device-drivers/include/Makefile
> @@ -13,9 +13,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> ${CC} -Wall -o userBlockInclude userBlockInclude.c
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
> diff --git a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
> index 3bc274dad..ae802f77c 100644
> --- a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
> +++ b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> modules:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
>
> help:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
> + $(MAKE) -C $(KDIR) M=$(PWD) help
>
> modules_install:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>
> endif
> diff --git a/testcases/kernel/device-drivers/nls/Makefile b/testcases/kernel/device-drivers/nls/Makefile
> index 172510fe8..a1fab20f8 100644
> --- a/testcases/kernel/device-drivers/nls/Makefile
> +++ b/testcases/kernel/device-drivers/nls/Makefile
> @@ -12,12 +12,12 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> ${CC} $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
> rm -f userBlockNLS
>
> diff --git a/testcases/kernel/device-drivers/usb/tusb/Makefile b/testcases/kernel/device-drivers/usb/tusb/Makefile
> index 9488cd563..4dcbca36c 100644
> --- a/testcases/kernel/device-drivers/usb/tusb/Makefile
> +++ b/testcases/kernel/device-drivers/usb/tusb/Makefile
> @@ -13,17 +13,17 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
>
> help:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
> + $(MAKE) -C $(KDIR) M=$(PWD) help
>
> modules_install:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>
> endif
> diff --git a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
> index 56e255b04..549c37d5c 100644
> --- a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
> +++ b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> modules:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>
> clean:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
> + $(MAKE) -C $(KDIR) M=$(PWD) clean
> rm -f modules.order
>
> help:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
> + $(MAKE) -C $(KDIR) M=$(PWD) help
>
> modules_install:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>
> endif
> diff --git a/testcases/kernel/fs/scsi/ltpfs/Makefile b/testcases/kernel/fs/scsi/ltpfs/Makefile
> index 7c46a4c4d..5f4030661 100644
> --- a/testcases/kernel/fs/scsi/ltpfs/Makefile
> +++ b/testcases/kernel/fs/scsi/ltpfs/Makefile
> @@ -14,9 +14,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
> PWD := $(shell pwd)
>
> default:
> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
> + $(MAKE) -C $(KDIR) M=$(PWD) modules
> ${CC} $(CFLAGS) -o ltpfstest -lm main.c
> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
> endif
>
> clean:
^ permalink raw reply [flat|nested] 6+ messages in thread* [LTP] [PATCH v2] Makefile: Use M to build extern kernel module instead of SUBDIRS
2021-04-07 8:30 ` yangx.jy
@ 2021-04-07 10:07 ` xuyang2018.jy
0 siblings, 0 replies; 6+ messages in thread
From: xuyang2018.jy @ 2021-04-07 10:07 UTC (permalink / raw)
To: ltp
Hi Xiao
> On 2021/4/7 17:04, Yang Xu wrote:
>> Since 5.3 kernel commit 7e35b42591c0 ("kbuild: remove SUBDIRS support"),
>> SUBDIRS has been removed. We can only use make M=dir or set the environment
>> variable KBUILD_EXTMOD to specify the directory of external module to build.
>>
> Hi,
>
> LGTM.
> Reviewed-by: Xiao Yang<yangx.jy@fujitsu.com>
Thanks for your review, I have merged this patch.
Best Regards
Yang Xu
>
> Best Regards,
> Xiao Yang
>> Signed-off-by: Yang Xu<xuyang2018.jy@fujitsu.com>
>> ---
>> v1->v2:
>> add mssing .../dev_sim_framework/kernel_space/Makefile
>> .../kernel/device-drivers/agp/kernel_space/Makefile | 4 ++--
>> testcases/kernel/device-drivers/base/tbase/Makefile | 4 ++--
>> .../dev_sim_framework/kernel_space/Makefile | 4 ++--
>> .../kernel/device-drivers/drm/kernel_space/Makefile | 2 +-
>> testcases/kernel/device-drivers/include/Makefile | 4 ++--
>> .../misc_modules/per_cpu_allocator_module/Makefile | 8 ++++----
>> testcases/kernel/device-drivers/nls/Makefile | 6 +++---
>> testcases/kernel/device-drivers/usb/tusb/Makefile | 10 +++++-----
>> .../kernel/device-drivers/v4l/kernel_space/Makefile | 8 ++++----
>> testcases/kernel/fs/scsi/ltpfs/Makefile | 4 ++--
>> 10 files changed, 27 insertions(+), 27 deletions(-)
>>
>> diff --git a/testcases/kernel/device-drivers/agp/kernel_space/Makefile b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
>> index 5357c135e..5a10064f0 100644
>> --- a/testcases/kernel/device-drivers/agp/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/agp/kernel_space/Makefile
>> @@ -14,8 +14,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/base/tbase/Makefile b/testcases/kernel/device-drivers/base/tbase/Makefile
>> index 6f7e5e2c1..5e5a40e61 100644
>> --- a/testcases/kernel/device-drivers/base/tbase/Makefile
>> +++ b/testcases/kernel/device-drivers/base/tbase/Makefile
>> @@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
>> index e7e7be607..ccaf3f9ac 100644
>> --- a/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/dev_sim_framework/kernel_space/Makefile
>> @@ -13,8 +13,8 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/drm/kernel_space/Makefile b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
>> index 11e54d9be..24b768d76 100644
>> --- a/testcases/kernel/device-drivers/drm/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/drm/kernel_space/Makefile
>> @@ -11,7 +11,7 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/include/Makefile b/testcases/kernel/device-drivers/include/Makefile
>> index c9810ba5e..72d7293c2 100644
>> --- a/testcases/kernel/device-drivers/include/Makefile
>> +++ b/testcases/kernel/device-drivers/include/Makefile
>> @@ -13,9 +13,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> ${CC} -Wall -o userBlockInclude userBlockInclude.c
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
>> diff --git a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
>> index 3bc274dad..ae802f77c 100644
>> --- a/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
>> +++ b/testcases/kernel/device-drivers/misc_modules/per_cpu_allocator_module/Makefile
>> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> modules:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>>
>> help:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
>> + $(MAKE) -C $(KDIR) M=$(PWD) help
>>
>> modules_install:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>>
>> endif
>> diff --git a/testcases/kernel/device-drivers/nls/Makefile b/testcases/kernel/device-drivers/nls/Makefile
>> index 172510fe8..a1fab20f8 100644
>> --- a/testcases/kernel/device-drivers/nls/Makefile
>> +++ b/testcases/kernel/device-drivers/nls/Makefile
>> @@ -12,12 +12,12 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> ${CC} $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>> rm -f userBlockNLS
>>
>> diff --git a/testcases/kernel/device-drivers/usb/tusb/Makefile b/testcases/kernel/device-drivers/usb/tusb/Makefile
>> index 9488cd563..4dcbca36c 100644
>> --- a/testcases/kernel/device-drivers/usb/tusb/Makefile
>> +++ b/testcases/kernel/device-drivers/usb/tusb/Makefile
>> @@ -13,17 +13,17 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>>
>> help:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
>> + $(MAKE) -C $(KDIR) M=$(PWD) help
>>
>> modules_install:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>>
>> endif
>> diff --git a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
>> index 56e255b04..549c37d5c 100644
>> --- a/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
>> +++ b/testcases/kernel/device-drivers/v4l/kernel_space/Makefile
>> @@ -9,16 +9,16 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> modules:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>>
>> clean:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
>> + $(MAKE) -C $(KDIR) M=$(PWD) clean
>> rm -f modules.order
>>
>> help:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
>> + $(MAKE) -C $(KDIR) M=$(PWD) help
>>
>> modules_install:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules_install
>>
>> endif
>> diff --git a/testcases/kernel/fs/scsi/ltpfs/Makefile b/testcases/kernel/fs/scsi/ltpfs/Makefile
>> index 7c46a4c4d..5f4030661 100644
>> --- a/testcases/kernel/fs/scsi/ltpfs/Makefile
>> +++ b/testcases/kernel/fs/scsi/ltpfs/Makefile
>> @@ -14,9 +14,9 @@ KDIR := /lib/modules/$(shell uname -r)/build
>> PWD := $(shell pwd)
>>
>> default:
>> - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
>> + $(MAKE) -C $(KDIR) M=$(PWD) modules
>> ${CC} $(CFLAGS) -o ltpfstest -lm main.c
>> -# $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
>> +# $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
>> endif
>>
>> clean:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-07 10:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-07 6:12 [LTP] [PATCH] Makefile: Use M to build extern kernel module instead of SUBDIRS Yang Xu
2021-04-07 7:25 ` yangx.jy
2021-04-07 7:55 ` xuyang2018.jy
2021-04-07 9:04 ` [LTP] [PATCH v2] " Yang Xu
2021-04-07 8:30 ` yangx.jy
2021-04-07 10:07 ` xuyang2018.jy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.