[PATCH] Makefile: Avoid non-portable GNU sed extension

[PATCH] Makefile: Avoid non-portable GNU sed extension

[Mark Kettenis]

Use [:space:] instead of \s and \S in regular expression that
determines the sandbox target architecture.  Fixes the build
failure on OpenBSD introduced with commit 4e65ca00f3a3
("efi_loader: bootmgr: add booting from removable media").

Fixes: f7691a6d73 ("sandbox: allow cross-compiling sandbox")
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ea80f00716..6eceeb35b4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ include include/host_arch.h
 ifeq ("", "$(CROSS_COMPILE)")
   MK_ARCH="${shell uname -m}"
 else
-  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^\s*\([^\/]*\/\)*\([^-]*\)-\S*/\2/p'}"
+  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\2/p'}"
 endif
 unexport HOST_ARCH
 ifeq ("x86_64", $(MK_ARCH))
-- 
2.36.0

Re: [PATCH] Makefile: Avoid non-portable GNU sed extension

[Heinrich Schuchardt]

On 5/5/22 16:42, Mark Kettenis wrote:
> Use [:space:] instead of \s and \S in regular expression that
> determines the sandbox target architecture.  Fixes the build
> failure on OpenBSD introduced with commit 4e65ca00f3a3
> ("efi_loader: bootmgr: add booting from removable media").
>
> Fixes: f7691a6d73 ("sandbox: allow cross-compiling sandbox")
nits, use 12 first digits of hash

Fixes: f7691a6d736b ("sandbox: allow cross-compiling sandbox")

> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

> ---
>   Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index ea80f00716..6eceeb35b4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -21,7 +21,7 @@ include include/host_arch.h
>   ifeq ("", "$(CROSS_COMPILE)")
>     MK_ARCH="${shell uname -m}"
>   else
> -  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^\s*\([^\/]*\/\)*\([^-]*\)-\S*/\2/p'}"
> +  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\2/p'}"
>   endif
>   unexport HOST_ARCH
>   ifeq ("x86_64", $(MK_ARCH))

Re: [PATCH] Makefile: Avoid non-portable GNU sed extension

[Mark Kettenis]

> Date: Thu, 5 May 2022 16:55:24 +0200
> From: Heinrich Schuchardt <xypron.glpk@gmx.de>
> 
> On 5/5/22 16:42, Mark Kettenis wrote:
> > Use [:space:] instead of \s and \S in regular expression that
> > determines the sandbox target architecture.  Fixes the build
> > failure on OpenBSD introduced with commit 4e65ca00f3a3
> > ("efi_loader: bootmgr: add booting from removable media").
> >
> > Fixes: f7691a6d73 ("sandbox: allow cross-compiling sandbox")
> nits, use 12 first digits of hash
> 
> Fixes: f7691a6d736b ("sandbox: allow cross-compiling sandbox")

Hmm, checkpatch didn't catch that one.  Is this something I should
do a resubmit for?

> > Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
> 
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> 
> > ---
> >   Makefile | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Makefile b/Makefile
> > index ea80f00716..6eceeb35b4 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -21,7 +21,7 @@ include include/host_arch.h
> >   ifeq ("", "$(CROSS_COMPILE)")
> >     MK_ARCH="${shell uname -m}"
> >   else
> > -  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^\s*\([^\/]*\/\)*\([^-]*\)-\S*/\2/p'}"
> > +  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\2/p'}"
> >   endif
> >   unexport HOST_ARCH
> >   ifeq ("x86_64", $(MK_ARCH))
> 
> 

Re: [PATCH] Makefile: Avoid non-portable GNU sed extension

[Heinrich Schuchardt]

Am 5. Mai 2022 18:58:48 MESZ schrieb Mark Kettenis <mark.kettenis@xs4all.nl>:
>> Date: Thu, 5 May 2022 16:55:24 +0200
>> From: Heinrich Schuchardt <xypron.glpk@gmx.de>
>> 
>> On 5/5/22 16:42, Mark Kettenis wrote:
>> > Use [:space:] instead of \s and \S in regular expression that
>> > determines the sandbox target architecture.  Fixes the build
>> > failure on OpenBSD introduced with commit 4e65ca00f3a3
>> > ("efi_loader: bootmgr: add booting from removable media").
>> >
>> > Fixes: f7691a6d73 ("sandbox: allow cross-compiling sandbox")
>> nits, use 12 first digits of hash
>> 
>> Fixes: f7691a6d736b ("sandbox: allow cross-compiling sandbox")
>
>Hmm, checkpatch didn't catch that one.  Is this something I should
>do a resubmit for?

No. I will just consider it in my pull request. 

Best regards 

Heinrich 
>
>> > Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
>> 
>> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
>> 
>> > ---
>> >   Makefile | 2 +-
>> >   1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/Makefile b/Makefile
>> > index ea80f00716..6eceeb35b4 100644
>> > --- a/Makefile
>> > +++ b/Makefile
>> > @@ -21,7 +21,7 @@ include include/host_arch.h
>> >   ifeq ("", "$(CROSS_COMPILE)")
>> >     MK_ARCH="${shell uname -m}"
>> >   else
>> > -  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^\s*\([^\/]*\/\)*\([^-]*\)-\S*/\2/p'}"
>> > +  MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^[[:space:]]*\([^\/]*\/\)*\([^-]*\)-[^[:space:]]*/\2/p'}"
>> >   endif
>> >   unexport HOST_ARCH
>> >   ifeq ("x86_64", $(MK_ARCH))
>> 
>>