From: xuyang2018.jy@fujitsu.com <xuyang2018.jy@fujitsu.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] Makefile: Use M to build extern kernel module instead of SUBDIRS
Date: Wed, 7 Apr 2021 07:55:01 +0000 [thread overview]
Message-ID: <606D736F.6000605@fujitsu.com> (raw)
In-Reply-To: <606D5E48.1060307@fujitsu.com>
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:
next prev parent reply other threads:[~2021-04-07 7:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2021-04-07 9:04 ` [LTP] [PATCH v2] " Yang Xu
2021-04-07 8:30 ` yangx.jy
2021-04-07 10:07 ` xuyang2018.jy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=606D736F.6000605@fujitsu.com \
--to=xuyang2018.jy@fujitsu.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox