Re: [PATCH] certs: Convert spaces in certs/Makefile to a tab

[Mickaël Salaün]

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@xxxxxxxxxx> 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@xxxxxxxxxx>
> > > cc: Mickaël Salaün <mic@xxxxxxxxxxxxxxxxxxx>
> > > cc: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
> > > cc: keyrings@xxxxxxxxxxxxxxx
> >
> >
> > 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