* Update from GCC 11.2 to 11.3
* Use python3-minimal instead of python
* Use --no-install-recommends, requiring ca-certificates, g++-multilib and
build-essential to be listed explicitly
The resulting container is ~50M smaller
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
---
automation/build/debian/buster-gcc-ibt.dockerfile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile b/automation/build/debian/buster-gcc-ibt.dockerfile
index 441d9a9ab37a..96ab4fe8a2f1 100644
--- a/automation/build/debian/buster-gcc-ibt.dockerfile
+++ b/automation/build/debian/buster-gcc-ibt.dockerfile
@@ -4,10 +4,12 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV USER root
RUN apt-get update && \
- apt-get --quiet --yes install \
+ apt-get --quiet --yes --no-install-recommends install \
bison \
build-essential \
+ ca-certificates \
flex \
+ g++-multilib \
libc6-dev-i386 \
libgmp-dev \
libisl-dev \
@@ -19,7 +21,7 @@ RUN apt-get update && \
RUN mkdir /build
WORKDIR /build
-RUN wget -q https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz -O - | tar xJ --strip=1
+RUN wget -q https://ftp.gnu.org/gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz -O - | tar xJ --strip=1
RUN wget -q https://xenbits.xen.org/people/andrewcoop/gcc-11.2-Add-fcf-check-attribute-yes-no.patch -O - | patch -p1
RUN ./configure \
--prefix=/opt/gcc-11-ibt \
@@ -53,13 +55,14 @@ RUN mkdir /build
WORKDIR /build
RUN apt-get update && \
- apt-get --quiet --yes install \
+ apt-get --quiet --yes --no-install-recommends install \
bison \
+ build-essential \
checkpolicy \
flex \
gawk \
make \
- python3 \
+ python3-minimal \
&& \
apt-get autoremove -y && \
apt-get clean && \
--
2.30.2
On Fri, 24 Mar 2023, Andrew Cooper wrote: > * Update from GCC 11.2 to 11.3 > * Use python3-minimal instead of python > * Use --no-install-recommends, requiring ca-certificates, g++-multilib and > build-essential to be listed explicitly > > The resulting container is ~50M smaller > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> I assume you have tested this successfully. Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > CC: Anthony PERARD <anthony.perard@citrix.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Michal Orzel <michal.orzel@amd.com> > CC: Doug Goldstein <cardoe@cardoe.com> > --- > automation/build/debian/buster-gcc-ibt.dockerfile | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile b/automation/build/debian/buster-gcc-ibt.dockerfile > index 441d9a9ab37a..96ab4fe8a2f1 100644 > --- a/automation/build/debian/buster-gcc-ibt.dockerfile > +++ b/automation/build/debian/buster-gcc-ibt.dockerfile > @@ -4,10 +4,12 @@ ENV DEBIAN_FRONTEND=noninteractive > ENV USER root > > RUN apt-get update && \ > - apt-get --quiet --yes install \ > + apt-get --quiet --yes --no-install-recommends install \ > bison \ > build-essential \ > + ca-certificates \ > flex \ > + g++-multilib \ > libc6-dev-i386 \ > libgmp-dev \ > libisl-dev \ > @@ -19,7 +21,7 @@ RUN apt-get update && \ > RUN mkdir /build > WORKDIR /build > > -RUN wget -q https://ftp.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz -O - | tar xJ --strip=1 > +RUN wget -q https://ftp.gnu.org/gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz -O - | tar xJ --strip=1 > RUN wget -q https://xenbits.xen.org/people/andrewcoop/gcc-11.2-Add-fcf-check-attribute-yes-no.patch -O - | patch -p1 > RUN ./configure \ > --prefix=/opt/gcc-11-ibt \ > @@ -53,13 +55,14 @@ RUN mkdir /build > WORKDIR /build > > RUN apt-get update && \ > - apt-get --quiet --yes install \ > + apt-get --quiet --yes --no-install-recommends install \ > bison \ > + build-essential \ > checkpolicy \ > flex \ > gawk \ > make \ > - python3 \ > + python3-minimal \ > && \ > apt-get autoremove -y && \ > apt-get clean && \ > -- > 2.30.2 >
© 2016 - 2024 Red Hat, Inc.