|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] automation: switch from Debian unstable to bookworm
commit 8ab05119df02081f2b1c3ab471a33b9f931050ad
Author: Stefano Stabellini <stefano.stabellini@xxxxxxx>
AuthorDate: Fri Aug 11 19:06:49 2023 -0700
Commit: Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Mon Aug 14 14:41:42 2023 -0700
automation: switch from Debian unstable to bookworm
Debian unstable used in the Xen containers is actually bookworm.
Switching to bookworm which is now stable means we are not basing our
containers on a moving target anymore.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
Reviewed-by: Michal Orzel <michal.orzel@xxxxxxx>
---
.../debian/bookworm-arm64v8-arm32-gcc.dockerfile | 23 +++++++++
.../build/debian/bookworm-arm64v8.dockerfile | 54 ++++++++++++++++++++++
.../build/debian/bookworm-cppcheck.dockerfile | 53 +++++++++++++++++++++
automation/build/debian/bookworm-i386.dockerfile | 50 ++++++++++++++++++++
automation/build/debian/bookworm.dockerfile | 51 ++++++++++++++++++++
.../debian/unstable-arm64v8-arm32-gcc.dockerfile | 23 ---------
.../build/debian/unstable-arm64v8.dockerfile | 54 ----------------------
.../build/debian/unstable-cppcheck.dockerfile | 53 ---------------------
automation/build/debian/unstable-i386.dockerfile | 50 --------------------
automation/build/debian/unstable.dockerfile | 51 --------------------
automation/scripts/containerize | 10 ++--
11 files changed, 236 insertions(+), 236 deletions(-)
diff --git a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
new file mode 100644
index 0000000000..b3295c435e
--- /dev/null
+++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile
@@ -0,0 +1,23 @@
+FROM arm64v8/debian:bookworm
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+ENV CROSS_COMPILE /usr/bin/arm-linux-gnueabihf-
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ flex \
+ bison \
+ git \
+ gcc-arm-linux-gnueabihf \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile
b/automation/build/debian/bookworm-arm64v8.dockerfile
new file mode 100644
index 0000000000..a6d4246d96
--- /dev/null
+++ b/automation/build/debian/bookworm-arm64v8.dockerfile
@@ -0,0 +1,54 @@
+FROM arm64v8/debian:bookworm
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ zlib1g-dev \
+ libncurses5-dev \
+ libssl-dev \
+ python3-dev \
+ xorg-dev \
+ uuid-dev \
+ libyajl-dev \
+ libaio-dev \
+ libglib2.0-dev \
+ clang \
+ libpixman-1-dev \
+ pkg-config \
+ flex \
+ bison \
+ acpica-tools \
+ libfdt-dev \
+ bin86 \
+ bcc \
+ liblzma-dev \
+ libnl-3-dev \
+ ocaml-nox \
+ libfindlib-ocaml-dev \
+ markdown \
+ transfig \
+ pandoc \
+ checkpolicy \
+ wget \
+ git \
+ nasm \
+ # for test phase, qemu-smoke-* jobs
+ u-boot-qemu \
+ u-boot-tools \
+ device-tree-compiler \
+ curl \
+ cpio \
+ busybox-static \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile
b/automation/build/debian/bookworm-cppcheck.dockerfile
new file mode 100644
index 0000000000..d64fb7b18c
--- /dev/null
+++ b/automation/build/debian/bookworm-cppcheck.dockerfile
@@ -0,0 +1,53 @@
+FROM arm64v8/debian:bookworm AS builder
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV CPPCHECK_VERSION=2.7
+ENV USER root
+
+# dependencies for cppcheck build
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ curl \
+ build-essential \
+ python-is-python3 \
+ libpcre3-dev
+
+RUN mkdir /build
+WORKDIR /build
+
+# cppcheck release build (see cppcheck readme.md)
+RUN curl -fsSLO
https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".tar.gz && \
+ tar xvzf "$CPPCHECK_VERSION".tar.gz && \
+ cd cppcheck-"$CPPCHECK_VERSION" && \
+ make install -j$(nproc) \
+ MATCHCOMPILER=yes \
+ FILESDIR=/usr/share/cppcheck \
+ HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare
-Wno-unused-function"
+
+FROM arm64v8/debian:bookworm
+COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck
+COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck
+
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# dependencies for cppcheck analysis including Xen-only build/cross-build
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ python-is-python3 \
+ libpcre3-dev \
+ flex \
+ bison \
+ gcc-arm-linux-gnueabihf \
+ gcc-x86-64-linux-gnu \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/bookworm-i386.dockerfile
b/automation/build/debian/bookworm-i386.dockerfile
new file mode 100644
index 0000000000..eb1c732f53
--- /dev/null
+++ b/automation/build/debian/bookworm-i386.dockerfile
@@ -0,0 +1,50 @@
+FROM i386/debian:bookworm
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+ENTRYPOINT ["linux32"]
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ zlib1g-dev \
+ libncurses5-dev \
+ libssl-dev \
+ python3-dev \
+ xorg-dev \
+ uuid-dev \
+ libyajl-dev \
+ libaio-dev \
+ libglib2.0-dev \
+ clang \
+ libpixman-1-dev \
+ pkg-config \
+ flex \
+ bison \
+ acpica-tools \
+ bin86 \
+ bcc \
+ liblzma-dev \
+ libc6-dev \
+ libnl-3-dev \
+ ocaml-nox \
+ libfindlib-ocaml-dev \
+ markdown \
+ transfig \
+ pandoc \
+ checkpolicy \
+ wget \
+ git \
+ nasm \
+ apt-transport-https \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/bookworm.dockerfile
b/automation/build/debian/bookworm.dockerfile
new file mode 100644
index 0000000000..f8415425e6
--- /dev/null
+++ b/automation/build/debian/bookworm.dockerfile
@@ -0,0 +1,51 @@
+FROM debian:bookworm
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ zlib1g-dev \
+ libncurses5-dev \
+ libssl-dev \
+ python3-dev \
+ xorg-dev \
+ uuid-dev \
+ libyajl-dev \
+ libaio-dev \
+ libglib2.0-dev \
+ clang \
+ libpixman-1-dev \
+ pkg-config \
+ flex \
+ bison \
+ acpica-tools \
+ bin86 \
+ bcc \
+ liblzma-dev \
+ # libc6-dev-i386 for Xen < 4.15
+ libc6-dev-i386 \
+ libnl-3-dev \
+ ocaml-nox \
+ libfindlib-ocaml-dev \
+ markdown \
+ transfig \
+ pandoc \
+ checkpolicy \
+ wget \
+ git \
+ nasm \
+ gnupg \
+ apt-transport-https \
+ golang \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
deleted file mode 100644
index 11860425a6..0000000000
--- a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM arm64v8/debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV USER root
-ENV CROSS_COMPILE /usr/bin/arm-linux-gnueabihf-
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apt-get update && \
- apt-get --quiet --yes install \
- build-essential \
- flex \
- bison \
- git \
- gcc-arm-linux-gnueabihf \
- && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/unstable-arm64v8.dockerfile
b/automation/build/debian/unstable-arm64v8.dockerfile
deleted file mode 100644
index b9b1587f88..0000000000
--- a/automation/build/debian/unstable-arm64v8.dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-FROM arm64v8/debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apt-get update && \
- apt-get --quiet --yes install \
- build-essential \
- zlib1g-dev \
- libncurses5-dev \
- libssl-dev \
- python3-dev \
- xorg-dev \
- uuid-dev \
- libyajl-dev \
- libaio-dev \
- libglib2.0-dev \
- clang \
- libpixman-1-dev \
- pkg-config \
- flex \
- bison \
- acpica-tools \
- libfdt-dev \
- bin86 \
- bcc \
- liblzma-dev \
- libnl-3-dev \
- ocaml-nox \
- libfindlib-ocaml-dev \
- markdown \
- transfig \
- pandoc \
- checkpolicy \
- wget \
- git \
- nasm \
- # for test phase, qemu-smoke-* jobs
- u-boot-qemu \
- u-boot-tools \
- device-tree-compiler \
- curl \
- cpio \
- busybox-static \
- && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/unstable-cppcheck.dockerfile
b/automation/build/debian/unstable-cppcheck.dockerfile
deleted file mode 100644
index adc192cea6..0000000000
--- a/automation/build/debian/unstable-cppcheck.dockerfile
+++ /dev/null
@@ -1,53 +0,0 @@
-FROM arm64v8/debian:unstable AS builder
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV CPPCHECK_VERSION=2.7
-ENV USER root
-
-# dependencies for cppcheck build
-RUN apt-get update && \
- apt-get --quiet --yes install \
- curl \
- build-essential \
- python-is-python3 \
- libpcre3-dev
-
-RUN mkdir /build
-WORKDIR /build
-
-# cppcheck release build (see cppcheck readme.md)
-RUN curl -fsSLO
https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".tar.gz && \
- tar xvzf "$CPPCHECK_VERSION".tar.gz && \
- cd cppcheck-"$CPPCHECK_VERSION" && \
- make install -j$(nproc) \
- MATCHCOMPILER=yes \
- FILESDIR=/usr/share/cppcheck \
- HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare
-Wno-unused-function"
-
-FROM arm64v8/debian:unstable
-COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck
-COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck
-
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# dependencies for cppcheck analysis including Xen-only build/cross-build
-RUN apt-get update && \
- apt-get --quiet --yes install \
- build-essential \
- python-is-python3 \
- libpcre3-dev \
- flex \
- bison \
- gcc-arm-linux-gnueabihf \
- gcc-x86-64-linux-gnu \
- && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/unstable-i386.dockerfile
b/automation/build/debian/unstable-i386.dockerfile
deleted file mode 100644
index 1c4928b09e..0000000000
--- a/automation/build/debian/unstable-i386.dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM i386/debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-ENTRYPOINT ["linux32"]
-
-# build depends
-RUN apt-get update && \
- apt-get --quiet --yes install \
- build-essential \
- zlib1g-dev \
- libncurses5-dev \
- libssl-dev \
- python3-dev \
- xorg-dev \
- uuid-dev \
- libyajl-dev \
- libaio-dev \
- libglib2.0-dev \
- clang \
- libpixman-1-dev \
- pkg-config \
- flex \
- bison \
- acpica-tools \
- bin86 \
- bcc \
- liblzma-dev \
- libc6-dev \
- libnl-3-dev \
- ocaml-nox \
- libfindlib-ocaml-dev \
- markdown \
- transfig \
- pandoc \
- checkpolicy \
- wget \
- git \
- nasm \
- apt-transport-https \
- && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/build/debian/unstable.dockerfile
b/automation/build/debian/unstable.dockerfile
deleted file mode 100644
index 6ef2878200..0000000000
--- a/automation/build/debian/unstable.dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM debian:unstable
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apt-get update && \
- apt-get --quiet --yes install \
- build-essential \
- zlib1g-dev \
- libncurses5-dev \
- libssl-dev \
- python3-dev \
- xorg-dev \
- uuid-dev \
- libyajl-dev \
- libaio-dev \
- libglib2.0-dev \
- clang \
- libpixman-1-dev \
- pkg-config \
- flex \
- bison \
- acpica-tools \
- bin86 \
- bcc \
- liblzma-dev \
- # libc6-dev-i386 for Xen < 4.15
- libc6-dev-i386 \
- libnl-3-dev \
- ocaml-nox \
- libfindlib-ocaml-dev \
- markdown \
- transfig \
- pandoc \
- checkpolicy \
- wget \
- git \
- nasm \
- gnupg \
- apt-transport-https \
- golang \
- && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 16d480ab75..acdef1b548 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -37,11 +37,11 @@ case "_${CONTAINER}" in
_stretch|_) CONTAINER="${BASE}/debian:stretch" ;;
_stretch-i386) CONTAINER="${BASE}/debian:stretch-i386" ;;
_buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;;
- _unstable|_) CONTAINER="${BASE}/debian:unstable" ;;
- _unstable-i386) CONTAINER="${BASE}/debian:unstable-i386" ;;
- _unstable-arm64v8-arm32-gcc)
CONTAINER="${BASE}/debian:unstable-arm64v8-arm32-gcc" ;;
- _unstable-arm64v8) CONTAINER="${BASE}/debian:unstable-arm64v8" ;;
- _unstable-cppcheck) CONTAINER="${BASE}/debian:unstable-cppcheck" ;;
+ _bookworm|_) CONTAINER="${BASE}/debian:bookworm" ;;
+ _bookworm-i386) CONTAINER="${BASE}/debian:bookworm-i386" ;;
+ _bookworm-arm64v8-arm32-gcc)
CONTAINER="${BASE}/debian:bookworm-arm64v8-arm32-gcc" ;;
+ _bookworm-arm64v8) CONTAINER="${BASE}/debian:bookworm-arm64v8" ;;
+ _bookworm-cppcheck) CONTAINER="${BASE}/debian:bookworm-cppcheck" ;;
_bionic) CONTAINER="${BASE}/ubuntu:bionic" ;;
_trusty) CONTAINER="${BASE}/ubuntu:trusty" ;;
_xenial) CONTAINER="${BASE}/ubuntu:xenial" ;;
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |