Re: [XEN PATCH v2 1/5] automation: add python3's setuptools to containers

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Mon, 11 Sep 2023, Javi Merino wrote:
> In preparation of dropping python distutils and moving to setuptools,
> add the python3 setuptools module to the containers that need it.
> 
> The centos7 container was building using python2.  Change it to build
> python scripts using python3.
> 
> Debian Stretch is no longer debian oldstable, so move to the archive
> repositories.
> 
> Signed-off-by: Javi Merino <javi.merino@xxxxxxxxx>
> ---
>  automation/build/alpine/3.18.dockerfile        |  1 +
>  automation/build/archlinux/current.dockerfile  |  1 +
>  automation/build/centos/7.dockerfile           |  3 ++-
>  automation/build/debian/bookworm.dockerfile    |  1 +
>  automation/build/debian/stretch.dockerfile     | 11 ++++++++++-
>  automation/build/suse/opensuse-leap.dockerfile |  1 +
>  automation/build/ubuntu/bionic.dockerfile      |  1 +
>  automation/build/ubuntu/focal.dockerfile       |  1 +
>  automation/build/ubuntu/trusty.dockerfile      |  1 +
>  automation/build/ubuntu/xenial.dockerfile      |  1 +

We are missing:
automation/build/alpine/3.18-arm64v8.dockerfile
automation/build/suse/opensuse-tumbleweed.dockerfile
automation/build/suse/opensuse-leap.dockerfile
automation/build/debian/jessie-i386.dockerfile
automation/build/debian/bookworm-i386.dockerfile
automation/build/debian/stretch-i386.dockerfile
automation/build/debian/jessie.dockerfile
automation/build/debian/bookworm-arm64v8.dockerfile
automation/build/fedora/29.dockerfile

+Bertrand because I am not sure if we need any changes to the Yocto
containers




>  10 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/automation/build/alpine/3.18.dockerfile 
> b/automation/build/alpine/3.18.dockerfile
> index ca5756955e..5d2a69a060 100644
> --- a/automation/build/alpine/3.18.dockerfile
> +++ b/automation/build/alpine/3.18.dockerfile
> @@ -34,6 +34,7 @@ RUN apk --no-cache add \
>    ocaml-findlib \
>    patch  \
>    python3-dev \
> +  py3-setuptools \
>    texinfo \
>    util-linux-dev \
>    xz-dev \
> diff --git a/automation/build/archlinux/current.dockerfile 
> b/automation/build/archlinux/current.dockerfile
> index 13fb472d9e..47e79637a4 100644
> --- a/automation/build/archlinux/current.dockerfile
> +++ b/automation/build/archlinux/current.dockerfile
> @@ -34,6 +34,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm 
> --noprogressbar --needed \
>          pixman \
>          pkgconfig \
>          python \
> +        python-setuptools \
>          sdl \
>          sdl2 \
>          spice \
> diff --git a/automation/build/centos/7.dockerfile 
> b/automation/build/centos/7.dockerfile
> index 69dcefb2f0..f14f70014a 100644
> --- a/automation/build/centos/7.dockerfile
> +++ b/automation/build/centos/7.dockerfile
> @@ -22,7 +22,8 @@ RUN yum -y update \
>          ncurses-devel \
>          zlib-devel \
>          openssl-devel \
> -        python-devel \
> +        python3-devel \
> +        python3-setuptools \
>          libuuid-devel \
>          pkgconfig \
>          flex \
> diff --git a/automation/build/debian/bookworm.dockerfile 
> b/automation/build/debian/bookworm.dockerfile
> index f8415425e6..ae008c8d46 100644
> --- a/automation/build/debian/bookworm.dockerfile
> +++ b/automation/build/debian/bookworm.dockerfile
> @@ -16,6 +16,7 @@ RUN apt-get update && \
>          libncurses5-dev \
>          libssl-dev \
>          python3-dev \
> +        python3-setuptools \
>          xorg-dev \
>          uuid-dev \
>          libyajl-dev \
> diff --git a/automation/build/debian/stretch.dockerfile 
> b/automation/build/debian/stretch.dockerfile
> index 1af6c691f8..9f4b91a9e3 100644
> --- a/automation/build/debian/stretch.dockerfile
> +++ b/automation/build/debian/stretch.dockerfile
> @@ -1,4 +1,4 @@
> -FROM debian:stretch
> +FROM debian/eol:stretch
>  LABEL maintainer.name="The Xen Project" \
>        maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
>  
> @@ -8,6 +8,14 @@ ENV USER root
>  RUN mkdir /build
>  WORKDIR /build
>  
> +# Debian stretch is now archived.  Fetch packages from
> +# archive.debian.org and skip the stretch-updates repository, as it is
> +# not longer valid.
> +RUN sed -i \
> +    -e 's/deb.debian.org/archive.debian.org/' \
> +    -e '/stretch-updates/d' \
> +    /etc/apt/sources.list

For the records I would prefer to get rid of Stretch altogether, but I
don't want to scope-creep this patch series, so this is OK for now.




>  # build depends
>  RUN apt-get update && \
>      apt-get --quiet --yes install \
> @@ -17,6 +25,7 @@ RUN apt-get update && \
>          libssl-dev \
>          python-dev \
>          python3-dev \
> +        python3-setuptools \
>          xorg-dev \
>          uuid-dev \
>          libyajl-dev \
> diff --git a/automation/build/suse/opensuse-leap.dockerfile 
> b/automation/build/suse/opensuse-leap.dockerfile
> index 98ee42970d..7010b71aca 100644
> --- a/automation/build/suse/opensuse-leap.dockerfile
> +++ b/automation/build/suse/opensuse-leap.dockerfile
> @@ -60,6 +60,7 @@ RUN zypper install -y --no-recommends \
>          'pkgconfig(sdl)' \
>          'pkgconfig(sdl2)' \
>          python3-devel \
> +        python3-setuptools \
>          systemd-devel \
>          tar \
>          transfig \
> diff --git a/automation/build/ubuntu/bionic.dockerfile 
> b/automation/build/ubuntu/bionic.dockerfile
> index e15f54431e..9cceb11ef9 100644
> --- a/automation/build/ubuntu/bionic.dockerfile
> +++ b/automation/build/ubuntu/bionic.dockerfile
> @@ -17,6 +17,7 @@ RUN apt-get update && \
>          libssl-dev \
>          python-dev \
>          python3-dev \
> +        python3-setuptools \
>          xorg-dev \
>          uuid-dev \
>          libyajl-dev \
> diff --git a/automation/build/ubuntu/focal.dockerfile 
> b/automation/build/ubuntu/focal.dockerfile
> index 9c851c0620..e3d11194ee 100644
> --- a/automation/build/ubuntu/focal.dockerfile
> +++ b/automation/build/ubuntu/focal.dockerfile
> @@ -16,6 +16,7 @@ RUN apt-get update && \
>          libncurses5-dev \
>          libssl-dev \
>          python3-dev \
> +        python3-setuptools \
>          xorg-dev \
>          uuid-dev \
>          libyajl-dev \
> diff --git a/automation/build/ubuntu/trusty.dockerfile 
> b/automation/build/ubuntu/trusty.dockerfile
> index 22e294c20c..7e819c8e4e 100644
> --- a/automation/build/ubuntu/trusty.dockerfile
> +++ b/automation/build/ubuntu/trusty.dockerfile
> @@ -17,6 +17,7 @@ RUN apt-get update && \
>          libssl-dev \
>          python-dev \
>          python3-dev \
> +        python3-setuptools \
>          xorg-dev \
>          uuid-dev \
>          libyajl-dev \
> diff --git a/automation/build/ubuntu/xenial.dockerfile 
> b/automation/build/ubuntu/xenial.dockerfile
> index 2d2ba3e31f..19464eead8 100644
> --- a/automation/build/ubuntu/xenial.dockerfile
> +++ b/automation/build/ubuntu/xenial.dockerfile
> @@ -17,6 +17,7 @@ RUN apt-get update && \
>          libssl-dev \
>          python-dev \
>          python3-dev \
> +        python3-setuptools \
>          xorg-dev \
>          uuid-dev \
>          libyajl-dev \
> -- 
> 2.41.0
>