* [PATCH] certs: Convert spaces in certs/Makefile to a tab
@ 2022-06-06 12:31 David Howells
2022-06-06 16:49 ` Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: David Howells @ 2022-06-06 12:31 UTC (permalink / raw)
To: torvalds
Cc: Mickaël Salaün, Jarkko Sakkinen, keyrings, dhowells,
linux-kbuild, linux-kernel
There's a rule in certs/Makefile for which the command begins with eight
spaces. This results in:
../certs/Makefile:21: FORCE prerequisite is missing
../certs/Makefile:21: *** missing separator. Stop.
Fix this by turning the spaces into a tab.
Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are valid")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Mickaël Salaün <mic@linux.microsoft.com>
cc: Jarkko Sakkinen <jarkko@kernel.org>
cc: keyrings@vger.kernel.org
---
certs/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/certs/Makefile b/certs/Makefile
index bb904f90f139..cb1a9da3fc58 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
targets += blacklist_hashes_checked
$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
- $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
+ $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
else
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-06 12:31 [PATCH] certs: Convert spaces in certs/Makefile to a tab David Howells
@ 2022-06-06 16:49 ` Masahiro Yamada
2022-06-09 17:12 ` Mickaël Salaün
2022-06-07 10:01 ` Jarkko Sakkinen
2022-06-09 17:05 ` Mickaël Salaün
2 siblings, 1 reply; 10+ messages in thread
From: Masahiro Yamada @ 2022-06-06 16:49 UTC (permalink / raw)
To: David Howells
Cc: Linus Torvalds, Mickaël Salaün, Jarkko Sakkinen,
keyrings, Linux Kbuild mailing list, Linux Kernel Mailing List
On Mon, Jun 6, 2022 at 9:32 PM David Howells <dhowells@redhat.com> wrote:
>
> There's a rule in certs/Makefile for which the command begins with eight
> spaces. This results in:
>
> ../certs/Makefile:21: FORCE prerequisite is missing
> ../certs/Makefile:21: *** missing separator. Stop.
>
> Fix this by turning the spaces into a tab.
>
> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are valid")
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Mickaël Salaün <mic@linux.microsoft.com>
> cc: Jarkko Sakkinen <jarkko@kernel.org>
> cc: keyrings@vger.kernel.org
Not only 8-space indentation, but also:
- config_filename does not exist
- $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX) is always empty
- $(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) is always empty
> ---
>
> certs/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/certs/Makefile b/certs/Makefile
> index bb904f90f139..cb1a9da3fc58 100644
> --- a/certs/Makefile
> +++ b/certs/Makefile
> @@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
>
> targets += blacklist_hashes_checked
> $(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
> - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
> + $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
> else
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
>
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-06 16:49 ` Masahiro Yamada
@ 2022-06-09 17:12 ` Mickaël Salaün
2022-06-09 17:17 ` Mickaël Salaün
0 siblings, 1 reply; 10+ messages in thread
From: Mickaël Salaün @ 2022-06-09 17:12 UTC (permalink / raw)
To: Masahiro Yamada, David Howells
Cc: Linus Torvalds, Jarkko Sakkinen, keyrings,
Linux Kbuild mailing list, Linux Kernel Mailing List
On 06/06/2022 18:49, Masahiro Yamada wrote:
> On Mon, Jun 6, 2022 at 9:32 PM David Howells <dhowells@redhat.com> wrote:
>>
>> There's a rule in certs/Makefile for which the command begins with eight
>> spaces. This results in:
>>
>> ../certs/Makefile:21: FORCE prerequisite is missing
>> ../certs/Makefile:21: *** missing separator. Stop.
>>
>> Fix this by turning the spaces into a tab.
>>
>> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are valid")
>> Signed-off-by: David Howells <dhowells@redhat.com>
>> cc: Mickaël Salaün <mic@linux.microsoft.com>
>> cc: Jarkko Sakkinen <jarkko@kernel.org>
>> cc: keyrings@vger.kernel.org
>
>
> Not only 8-space indentation, but also:
>
> - config_filename does not exist
> - $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX) is always empty
> - $(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) is always empty
These are imported helpers (not only used for this hash list BTW), hence
not defined in this Makefile.
>
>
>> ---
>>
>> certs/Makefile | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/certs/Makefile b/certs/Makefile
>> index bb904f90f139..cb1a9da3fc58 100644
>> --- a/certs/Makefile
>> +++ b/certs/Makefile
>> @@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
>>
>> targets += blacklist_hashes_checked
>> $(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
>> - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
>> + $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
>> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
>> else
>> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
>>
>>
>
>
> --
> Best Regards
> Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-09 17:12 ` Mickaël Salaün
@ 2022-06-09 17:17 ` Mickaël Salaün
2022-06-09 18:21 ` Masahiro Yamada
2022-06-11 17:29 ` Masahiro Yamada
0 siblings, 2 replies; 10+ messages in thread
From: Mickaël Salaün @ 2022-06-09 17:17 UTC (permalink / raw)
To: Masahiro Yamada, David Howells
Cc: Linus Torvalds, Jarkko Sakkinen, keyrings,
Linux Kbuild mailing list, Linux Kernel Mailing List
On 09/06/2022 19:12, Mickaël Salaün wrote:
>
> On 06/06/2022 18:49, Masahiro Yamada wrote:
>> On Mon, Jun 6, 2022 at 9:32 PM David Howells <dhowells@redhat.com> wrote:
>>>
>>> There's a rule in certs/Makefile for which the command begins with eight
>>> spaces. This results in:
>>>
>>> ../certs/Makefile:21: FORCE prerequisite is missing
>>> ../certs/Makefile:21: *** missing separator. Stop.
>>>
>>> Fix this by turning the spaces into a tab.
>>>
>>> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are
>>> valid")
>>> Signed-off-by: David Howells <dhowells@redhat.com>
>>> cc: Mickaël Salaün <mic@linux.microsoft.com>
>>> cc: Jarkko Sakkinen <jarkko@kernel.org>
>>> cc: keyrings@vger.kernel.org
>>
>>
>> Not only 8-space indentation, but also:
>>
>> - config_filename does not exist
>> - $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX) is always empty
>> - $(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) is always empty
>
> These are imported helpers (not only used for this hash list BTW), hence
> not defined in this Makefile.
Well, they were defined in scripts/Kbuild.include but they are gone
since your commit b8c96a6b466c ("certs: simplify $(srctree)/ handling
and remove config_filename macro").
I guess it just happens during the merge. We need to fix that.
>
>>
>>
>>> ---
>>>
>>> certs/Makefile | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/certs/Makefile b/certs/Makefile
>>> index bb904f90f139..cb1a9da3fc58 100644
>>> --- a/certs/Makefile
>>> +++ b/certs/Makefile
>>> @@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
>>>
>>> targets += blacklist_hashes_checked
>>> $(obj)/blacklist_hashes_checked:
>>> $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME)
>>> scripts/check-blacklist-hashes.awk FORCE
>>> - $(call
>>> if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
>>>
>>> + $(call
>>> if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
>>>
>>> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
>>> else
>>> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
>>>
>>>
>>
>>
>> --
>> Best Regards
>> Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-09 17:17 ` Mickaël Salaün
@ 2022-06-09 18:21 ` Masahiro Yamada
2022-06-11 17:29 ` Masahiro Yamada
1 sibling, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2022-06-09 18:21 UTC (permalink / raw)
To: Mickaël Salaün
Cc: David Howells, Linus Torvalds, Jarkko Sakkinen, keyrings,
Linux Kbuild mailing list, Linux Kernel Mailing List
On Fri, Jun 10, 2022 at 2:17 AM Mickaël Salaün <mic@digikod.net> wrote:
>
>
>
> On 09/06/2022 19:12, Mickaël Salaün wrote:
> >
> > On 06/06/2022 18:49, Masahiro Yamada wrote:
> >> On Mon, Jun 6, 2022 at 9:32 PM David Howells <dhowells@redhat.com> wrote:
> >>>
> >>> There's a rule in certs/Makefile for which the command begins with eight
> >>> spaces. This results in:
> >>>
> >>> ../certs/Makefile:21: FORCE prerequisite is missing
> >>> ../certs/Makefile:21: *** missing separator. Stop.
> >>>
> >>> Fix this by turning the spaces into a tab.
> >>>
> >>> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are
> >>> valid")
> >>> Signed-off-by: David Howells <dhowells@redhat.com>
> >>> cc: Mickaël Salaün <mic@linux.microsoft.com>
> >>> cc: Jarkko Sakkinen <jarkko@kernel.org>
> >>> cc: keyrings@vger.kernel.org
> >>
> >>
> >> Not only 8-space indentation, but also:
> >>
> >> - config_filename does not exist
> >> - $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX) is always empty
> >> - $(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) is always empty
> >
> > These are imported helpers (not only used for this hash list BTW), hence
> > not defined in this Makefile.
>
> Well, they were defined in scripts/Kbuild.include but they are gone
> since your commit b8c96a6b466c ("certs: simplify $(srctree)/ handling
> and remove config_filename macro").
>
> I guess it just happens during the merge. We need to fix that.
>
Right, it seems your patch was flying for a long time.
$ git show --pretty=fuller addf466389d9d78f255e8b15ac44ab4791029852
commit addf466389d9d78f255e8b15ac44ab4791029852
Author: Mickaël Salaün <mic@linux.microsoft.com>
AuthorDate: Mon Jul 12 19:03:10 2021 +0200
Commit: Jarkko Sakkinen <jarkko@kernel.org>
CommitDate: Mon May 23 18:47:49 2022 +0300
certs: Check that builtin blacklist hashes are valid
It was committed 8 months after the patch submission.
The base code changed during the gap.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-09 17:17 ` Mickaël Salaün
2022-06-09 18:21 ` Masahiro Yamada
@ 2022-06-11 17:29 ` Masahiro Yamada
1 sibling, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2022-06-11 17:29 UTC (permalink / raw)
To: Mickaël Salaün
Cc: David Howells, Linus Torvalds, Jarkko Sakkinen, keyrings,
Linux Kbuild mailing list, Linux Kernel Mailing List
On Fri, Jun 10, 2022 at 2:17 AM Mickaël Salaün <mic@digikod.net> wrote:
>
>
>
> On 09/06/2022 19:12, Mickaël Salaün wrote:
> >
> > On 06/06/2022 18:49, Masahiro Yamada wrote:
> >> On Mon, Jun 6, 2022 at 9:32 PM David Howells <dhowells@redhat.com> wrote:
> >>>
> >>> There's a rule in certs/Makefile for which the command begins with eight
> >>> spaces. This results in:
> >>>
> >>> ../certs/Makefile:21: FORCE prerequisite is missing
> >>> ../certs/Makefile:21: *** missing separator. Stop.
> >>>
> >>> Fix this by turning the spaces into a tab.
> >>>
> >>> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are
> >>> valid")
> >>> Signed-off-by: David Howells <dhowells@redhat.com>
> >>> cc: Mickaël Salaün <mic@linux.microsoft.com>
> >>> cc: Jarkko Sakkinen <jarkko@kernel.org>
> >>> cc: keyrings@vger.kernel.org
> >>
> >>
> >> Not only 8-space indentation, but also:
> >>
> >> - config_filename does not exist
> >> - $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX) is always empty
> >> - $(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) is always empty
> >
> > These are imported helpers (not only used for this hash list BTW), hence
> > not defined in this Makefile.
>
> Well, they were defined in scripts/Kbuild.include but they are gone
> since your commit b8c96a6b466c ("certs: simplify $(srctree)/ handling
> and remove config_filename macro").
>
> I guess it just happens during the merge. We need to fix that.
Today, I took a closer look at it.
I volunteered to fix the build issues with some refactoring.
https://lore.kernel.org/keyrings/20220611172233.1494073-1-masahiroy@kernel.org/T/#t
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-06 12:31 [PATCH] certs: Convert spaces in certs/Makefile to a tab David Howells
2022-06-06 16:49 ` Masahiro Yamada
@ 2022-06-07 10:01 ` Jarkko Sakkinen
2022-06-09 17:05 ` Mickaël Salaün
2 siblings, 0 replies; 10+ messages in thread
From: Jarkko Sakkinen @ 2022-06-07 10:01 UTC (permalink / raw)
To: David Howells
Cc: torvalds, Mickaël Salaün, keyrings, linux-kbuild, linux-kernel
On Mon, Jun 06, 2022 at 01:31:59PM +0100, David Howells wrote:
> There's a rule in certs/Makefile for which the command begins with eight
> spaces. This results in:
>
> ../certs/Makefile:21: FORCE prerequisite is missing
> ../certs/Makefile:21: *** missing separator. Stop.
>
> Fix this by turning the spaces into a tab.
>
> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are valid")
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Mickaël Salaün <mic@linux.microsoft.com>
> cc: Jarkko Sakkinen <jarkko@kernel.org>
> cc: keyrings@vger.kernel.org
> ---
>
> certs/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/certs/Makefile b/certs/Makefile
> index bb904f90f139..cb1a9da3fc58 100644
> --- a/certs/Makefile
> +++ b/certs/Makefile
> @@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
>
> targets += blacklist_hashes_checked
> $(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
> - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
> + $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
> else
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
>
>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
BR, Jarkko
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-06 12:31 [PATCH] certs: Convert spaces in certs/Makefile to a tab David Howells
2022-06-06 16:49 ` Masahiro Yamada
2022-06-07 10:01 ` Jarkko Sakkinen
@ 2022-06-09 17:05 ` Mickaël Salaün
2022-06-09 18:18 ` Masahiro Yamada
2 siblings, 1 reply; 10+ messages in thread
From: Mickaël Salaün @ 2022-06-09 17:05 UTC (permalink / raw)
To: David Howells, torvalds
Cc: Jarkko Sakkinen, keyrings, linux-kbuild, linux-kernel
On 06/06/2022 14:31, David Howells wrote:
> There's a rule in certs/Makefile for which the command begins with eight
> spaces. This results in:
>
> ../certs/Makefile:21: FORCE prerequisite is missing
> ../certs/Makefile:21: *** missing separator. Stop.
>
> Fix this by turning the spaces into a tab.
These spaces were not part of my patch but they are indeed in this file
now: https://lore.kernel.org/r/20210712170313.884724-3-mic@digikod.net
Reviewed-by: Mickaël Salaün <mic@linux.microsoft.com>
>
> Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are valid")
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Mickaël Salaün <mic@linux.microsoft.com>
> cc: Jarkko Sakkinen <jarkko@kernel.org>
> cc: keyrings@vger.kernel.org
> ---
>
> certs/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/certs/Makefile b/certs/Makefile
> index bb904f90f139..cb1a9da3fc58 100644
> --- a/certs/Makefile
> +++ b/certs/Makefile
> @@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
>
> targets += blacklist_hashes_checked
> $(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
> - $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
> + $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
> else
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab
2022-06-09 17:05 ` Mickaël Salaün
@ 2022-06-09 18:18 ` Masahiro Yamada
0 siblings, 0 replies; 10+ messages in thread
From: Masahiro Yamada @ 2022-06-09 18:18 UTC (permalink / raw)
To: Mickaël Salaün
Cc: David Howells, Linus Torvalds, Jarkko Sakkinen, keyrings,
Linux Kbuild mailing list, Linux Kernel Mailing List
On Fri, Jun 10, 2022 at 2:05 AM Mickaël Salaün <mic@digikod.net> wrote:
>
>
> On 06/06/2022 14:31, David Howells wrote:
> > There's a rule in certs/Makefile for which the command begins with eight
> > spaces. This results in:
> >
> > ../certs/Makefile:21: FORCE prerequisite is missing
> > ../certs/Makefile:21: *** missing separator. Stop.
> >
> > Fix this by turning the spaces into a tab.
>
> These spaces were not part of my patch but they are indeed in this file
> now: https://lore.kernel.org/r/20210712170313.884724-3-mic@digikod.net
>
> Reviewed-by: Mickaël Salaün <mic@linux.microsoft.com>
Indeed, you used a tab,
but the applied code (commit addf466389d9) uses 8 spaces.
I think something bad happened
when the committer locally modified the code.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] certs: Convert spaces in certs/Makefile to a tab
@ 2022-06-10 18:35 David Howells
0 siblings, 0 replies; 10+ messages in thread
From: David Howells @ 2022-06-10 18:35 UTC (permalink / raw)
To: torvalds
Cc: dhowells, Mickaël Salaün, Jarkko Sakkinen,
Masahiro Yamada, keyrings, linux-kbuild, linux-kernel
Hi Linus,
Can you apply this please? It fixes a build error that can crop up
occasionally due to a Makefile error.
Thanks,
David
---
certs: Convert spaces in certs/Makefile to a tab
There's a rule in certs/Makefile for which the command begins with eight
spaces. This results in:
../certs/Makefile:21: FORCE prerequisite is missing
../certs/Makefile:21: *** missing separator. Stop.
Fix this by turning the spaces into a tab.
Fixes: addf466389d9 ("certs: Check that builtin blacklist hashes are valid")
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: Mickaël Salaün <mic@linux.microsoft.com>
cc: keyrings@vger.kernel.org
Link: https://lore.kernel.org/r/486b1b80-9932-aab6-138d-434c541c934a@digikod.net/ # v1
---
certs/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/certs/Makefile b/certs/Makefile
index bb904f90f139..cb1a9da3fc58 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -18,7 +18,7 @@ CFLAGS_blacklist_hashes.o += -I$(srctree)
targets += blacklist_hashes_checked
$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
- $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
+ $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
else
obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-06-11 17:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-06 12:31 [PATCH] certs: Convert spaces in certs/Makefile to a tab David Howells
2022-06-06 16:49 ` Masahiro Yamada
2022-06-09 17:12 ` Mickaël Salaün
2022-06-09 17:17 ` Mickaël Salaün
2022-06-09 18:21 ` Masahiro Yamada
2022-06-11 17:29 ` Masahiro Yamada
2022-06-07 10:01 ` Jarkko Sakkinen
2022-06-09 17:05 ` Mickaël Salaün
2022-06-09 18:18 ` Masahiro Yamada
2022-06-10 18:35 David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).