CI: Add gnu grep to alpine containers

[PATCH] CI: Add gnu grep to alpine containers

Posted by Andrew Cooper 2 years, 2 months ago

A forthcoming change is going to want more support than busybox's grep can
provide.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Wei Liu <wl@xen.org>
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Jan Beulich <JBeulich@suse.com>

I've already rebuilt the containers and confirmed that the build is still fine.
---
 automation/build/alpine/3.12.dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile
index 4ee3ddc12e52..4cce7ab926dc 100644
--- a/automation/build/alpine/3.12.dockerfile
+++ b/automation/build/alpine/3.12.dockerfile
@@ -26,6 +26,7 @@ RUN \
   # gettext for Xen < 4.13
   apk add gettext && \
   apk add git && \
+  apk add grep && \
   apk add iasl && \
   apk add libaio-dev && \
   apk add linux-headers && \
-- 
2.11.0

Re: [PATCH] CI: Add gnu grep to alpine containers

Posted by Anthony PERARD 2 years, 2 months ago

On Fri, Feb 18, 2022 at 01:17:40PM +0000, Andrew Cooper wrote:
> A forthcoming change is going to want more support than busybox's grep can
> provide.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Doug Goldstein <cardoe@cardoe.com>
> CC: Wei Liu <wl@xen.org>
> CC: Anthony PERARD <anthony.perard@citrix.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Jan Beulich <JBeulich@suse.com>
> 
> I've already rebuilt the containers and confirmed that the build is still fine.

Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Thanks,

-- 
Anthony PERARD

Re: [PATCH] CI: Add gnu grep to alpine containers

Posted by Stefano Stabellini 2 years, 2 months ago

On Fri, 18 Feb 2022, Anthony PERARD wrote:
> On Fri, Feb 18, 2022 at 01:17:40PM +0000, Andrew Cooper wrote:
> > A forthcoming change is going to want more support than busybox's grep can
> > provide.
> > 
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > ---
> > CC: Doug Goldstein <cardoe@cardoe.com>
> > CC: Wei Liu <wl@xen.org>
> > CC: Anthony PERARD <anthony.perard@citrix.com>
> > CC: Roger Pau Monné <roger.pau@citrix.com>
> > CC: Stefano Stabellini <sstabellini@kernel.org>
> > CC: Jan Beulich <JBeulich@suse.com>
> > 
> > I've already rebuilt the containers and confirmed that the build is still fine.
> 
> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

Good for me too. Out of curiousity, what is that is not working with
busybox's grep? Is it regex?

Re: [PATCH] CI: Add gnu grep to alpine containers

Posted by Andrew Cooper 2 years, 2 months ago

On 18/02/2022 16:28, Stefano Stabellini wrote:
> On Fri, 18 Feb 2022, Anthony PERARD wrote:
>> On Fri, Feb 18, 2022 at 01:17:40PM +0000, Andrew Cooper wrote:
>>> A forthcoming change is going to want more support than busybox's grep can
>>> provide.
>>>
>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> ---
>>> CC: Doug Goldstein <cardoe@cardoe.com>
>>> CC: Wei Liu <wl@xen.org>
>>> CC: Anthony PERARD <anthony.perard@citrix.com>
>>> CC: Roger Pau Monné <roger.pau@citrix.com>
>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>> CC: Jan Beulich <JBeulich@suse.com>
>>>
>>> I've already rebuilt the containers and confirmed that the build is still fine.
>> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
> Good for me too. Out of curiousity, what is that is not working with
> busybox's grep? Is it regex?

No.  Binary searching, which we want to use in a build-time check for
CET-IBT.

https://lore.kernel.org/xen-devel/8c6d9714-7e45-1603-a5ad-d49fc060304e@srcf.net/

~Andrew