diff mbox series

Makefile: replace headers_install with headers for kselftest

Message ID a7af58feaa6ae6d3b0c8c55972a470cec62341e5.1657693952.git.guillaume.tucker@collabora.com (mailing list archive)
State New, archived
Headers show
Series Makefile: replace headers_install with headers for kselftest | expand

Commit Message

Guillaume Tucker July 13, 2022, 6:33 a.m. UTC
Replace headers_install with headers as kselftest uses the header
files from within the kernel tree rather than from a system-wide
installation.

We can still run this directly:

  $ make O=build kselftest-all

and when building from the selftests directory:

  $ make O=build headers
  $ make O=build -C tools/testing/selftests all

Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Reported-by: Masahiro Yamada <masahiroy@kernel.org>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Shuah Khan July 14, 2022, 8:45 p.m. UTC | #1
On 7/13/22 12:33 AM, Guillaume Tucker wrote:
> Replace headers_install with headers as kselftest uses the header
> files from within the kernel tree rather than from a system-wide
> installation.
> 
> We can still run this directly:
> 
>    $ make O=build kselftest-all
> 
> and when building from the selftests directory:
> 
>    $ make O=build headers
>    $ make O=build -C tools/testing/selftests all
> 
> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> Reported-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>   Makefile | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index fb2f3bb53a6b..5c934d16664c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1347,10 +1347,10 @@ tools/%: FORCE
>   # Kernel selftest
>   
>   PHONY += kselftest
> -kselftest: headers_install
> +kselftest: headers
>   	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
>   
> -kselftest-%: headers_install FORCE
> +kselftest-%: headers FORCE
>   	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
>   
>   PHONY += kselftest-merge
> 

Thank you for taking care of this. This will go through kbuild?

Acked-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah
Guillaume Tucker July 19, 2022, 12:37 p.m. UTC | #2
On 14/07/2022 22:45, Shuah Khan wrote:
> On 7/13/22 12:33 AM, Guillaume Tucker wrote:
>> Replace headers_install with headers as kselftest uses the header
>> files from within the kernel tree rather than from a system-wide
>> installation.
>>
>> We can still run this directly:
>>
>>    $ make O=build kselftest-all
>>
>> and when building from the selftests directory:
>>
>>    $ make O=build headers
>>    $ make O=build -C tools/testing/selftests all
>>
>> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
>> Reported-by: Masahiro Yamada <masahiroy@kernel.org>
>> ---
>>   Makefile | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index fb2f3bb53a6b..5c934d16664c 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -1347,10 +1347,10 @@ tools/%: FORCE
>>   # Kernel selftest
>>     PHONY += kselftest
>> -kselftest: headers_install
>> +kselftest: headers
>>       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
>>   -kselftest-%: headers_install FORCE
>> +kselftest-%: headers FORCE
>>       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
>>     PHONY += kselftest-merge
>>
> 
> Thank you for taking care of this. This will go through kbuild?

You're welcome.

Masahiro-san,

A you OK with applying this in the kbuild tree ahead of the
upcoming merge window?

Best wishes,
Guillaume
 
> Acked-by: Shuah Khan <skhan@linuxfoundation.org>
> 
> thanks,
> -- Shuah
>
Masahiro Yamada July 19, 2022, 3:06 p.m. UTC | #3
On Tue, Jul 19, 2022 at 9:37 PM Guillaume Tucker
<guillaume.tucker@collabora.com> wrote:
>
> On 14/07/2022 22:45, Shuah Khan wrote:
> > On 7/13/22 12:33 AM, Guillaume Tucker wrote:
> >> Replace headers_install with headers as kselftest uses the header
> >> files from within the kernel tree rather than from a system-wide
> >> installation.
> >>
> >> We can still run this directly:
> >>
> >>    $ make O=build kselftest-all
> >>
> >> and when building from the selftests directory:
> >>
> >>    $ make O=build headers
> >>    $ make O=build -C tools/testing/selftests all
> >>
> >> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
> >> Reported-by: Masahiro Yamada <masahiroy@kernel.org>
> >> ---
> >>   Makefile | 4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/Makefile b/Makefile
> >> index fb2f3bb53a6b..5c934d16664c 100644
> >> --- a/Makefile
> >> +++ b/Makefile
> >> @@ -1347,10 +1347,10 @@ tools/%: FORCE
> >>   # Kernel selftest
> >>     PHONY += kselftest
> >> -kselftest: headers_install
> >> +kselftest: headers
> >>       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
> >>   -kselftest-%: headers_install FORCE
> >> +kselftest-%: headers FORCE
> >>       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
> >>     PHONY += kselftest-merge
> >>
> >
> > Thank you for taking care of this. This will go through kbuild?
>
> You're welcome.
>
> Masahiro-san,
>
> A you OK with applying this in the kbuild tree ahead of the
> upcoming merge window?


No.

This is a fix-up patch on top of the previous one [1],
which  was applied to the kselftest tree.

This cannot apply to the kbuild tree.

[1]: https://lore.kernel.org/linux-kbuild/168ede35-12e0-c535-9d94-23b65a1beb28@collabora.com/T/#mb8ec7004f7c9b89fbb50c19022760e19701af7f6






> Best wishes,
> Guillaume
>
> > Acked-by: Shuah Khan <skhan@linuxfoundation.org>
> >
> > thanks,
> > -- Shuah
> >
Guillaume Tucker July 19, 2022, 5:31 p.m. UTC | #4
On 19/07/2022 17:06, Masahiro Yamada wrote:
> On Tue, Jul 19, 2022 at 9:37 PM Guillaume Tucker
> <guillaume.tucker@collabora.com> wrote:
>>
>> On 14/07/2022 22:45, Shuah Khan wrote:
>>> On 7/13/22 12:33 AM, Guillaume Tucker wrote:
>>>> Replace headers_install with headers as kselftest uses the header
>>>> files from within the kernel tree rather than from a system-wide
>>>> installation.
>>>>
>>>> We can still run this directly:
>>>>
>>>>    $ make O=build kselftest-all
>>>>
>>>> and when building from the selftests directory:
>>>>
>>>>    $ make O=build headers
>>>>    $ make O=build -C tools/testing/selftests all
>>>>
>>>> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
>>>> Reported-by: Masahiro Yamada <masahiroy@kernel.org>
>>>> ---
>>>>   Makefile | 4 ++--
>>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/Makefile b/Makefile
>>>> index fb2f3bb53a6b..5c934d16664c 100644
>>>> --- a/Makefile
>>>> +++ b/Makefile
>>>> @@ -1347,10 +1347,10 @@ tools/%: FORCE
>>>>   # Kernel selftest
>>>>     PHONY += kselftest
>>>> -kselftest: headers_install
>>>> +kselftest: headers
>>>>       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
>>>>   -kselftest-%: headers_install FORCE
>>>> +kselftest-%: headers FORCE
>>>>       $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
>>>>     PHONY += kselftest-merge
>>>>
>>>
>>> Thank you for taking care of this. This will go through kbuild?
>>
>> You're welcome.
>>
>> Masahiro-san,
>>
>> A you OK with applying this in the kbuild tree ahead of the
>> upcoming merge window?
> 
> 
> No.
> 
> This is a fix-up patch on top of the previous one [1],
> which  was applied to the kselftest tree.
> 
> This cannot apply to the kbuild tree.

OK thank you for confirming.

Shuah, I guess you're happy to apply it to the kselftest tree
instead then?

Guillaume

> [1]: https://lore.kernel.org/linux-kbuild/168ede35-12e0-c535-9d94-23b65a1beb28@collabora.com/T/#mb8ec7004f7c9b89fbb50c19022760e19701af7f6
> 
> 
> 
> 
> 
> 
>> Best wishes,
>> Guillaume
>>
>>> Acked-by: Shuah Khan <skhan@linuxfoundation.org>
>>>
>>> thanks,
>>> -- Shuah
>>>
> 
> 
>
Shuah Khan July 27, 2022, 12:13 a.m. UTC | #5
On 7/19/22 11:31 AM, Guillaume Tucker wrote:
> On 19/07/2022 17:06, Masahiro Yamada wrote:
>> On Tue, Jul 19, 2022 at 9:37 PM Guillaume Tucker
>> <guillaume.tucker@collabora.com> wrote:
>>>

>>>
>>> Masahiro-san,
>>>
>>> A you OK with applying this in the kbuild tree ahead of the
>>> upcoming merge window?
>>
>>
>> No.
>>
>> This is a fix-up patch on top of the previous one [1],
>> which  was applied to the kselftest tree.
>>
>> This cannot apply to the kbuild tree.
> 
> OK thank you for confirming.
> 
> Shuah, I guess you're happy to apply it to the kselftest tree
> instead then?
> 

Sorry for a late response due to time off. Working through my Inbox.

Applied now to linux-kselftest next for 5.20-rc1.

thanks,
-- Shuah
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index fb2f3bb53a6b..5c934d16664c 100644
--- a/Makefile
+++ b/Makefile
@@ -1347,10 +1347,10 @@  tools/%: FORCE
 # Kernel selftest
 
 PHONY += kselftest
-kselftest: headers_install
+kselftest: headers
 	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
 
-kselftest-%: headers_install FORCE
+kselftest-%: headers FORCE
 	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
 
 PHONY += kselftest-merge