From 80b7c90fd6cdd4385a2a4758e04eb74dbaad2476 Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Fri, 25 Oct 2024 21:35:28 +0200 Subject: [PATCH 1/7] Fixes so yosys builds, missing dependency and add fix git cloning. --- debian-bookworm/yosys/HDLC | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian-bookworm/yosys/HDLC b/debian-bookworm/yosys/HDLC index 0fe580c6..61e8c4ad 100644 --- a/debian-bookworm/yosys/HDLC +++ b/debian-bookworm/yosys/HDLC @@ -26,6 +26,7 @@ makedepends=( flex gawk gcc + g++ pkg-config zlib1g-dev clang @@ -38,7 +39,7 @@ testdepends=( ) build() { - git clone https://github.com/YosysHQ/yosys.git /tmp/yosys + git clone --recurse-submodules https://github.com/YosysHQ/yosys.git /tmp/yosys cd /tmp/yosys make -j $(nproc) make DESTDIR=/opt/yosys install From 1d2016e864bfda97dca87dbe6d475f2aa10976d8 Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Fri, 25 Oct 2024 21:49:37 +0200 Subject: [PATCH 2/7] Add missing dependency to build cvc --- debian-bookworm/cvc/HDLC | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bookworm/cvc/HDLC b/debian-bookworm/cvc/HDLC index 63074a3f..cfc05ffe 100644 --- a/debian-bookworm/cvc/HDLC +++ b/debian-bookworm/cvc/HDLC @@ -34,6 +34,7 @@ makedepends=( python3-pyparsing python3-toml python3-venv + python3-pip openjdk-17-jre-headless ) From b6f8caaa951d2609826741ac3a65d81d949b7122 Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Mon, 28 Oct 2024 22:26:45 +0100 Subject: [PATCH 3/7] Add pono to builds with bookworm --- debian-bookworm/pono/Dockerfile | 48 +++++++++++++++++++++++++++++ debian-bookworm/pono/HDLC | 53 +++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 debian-bookworm/pono/Dockerfile create mode 100644 debian-bookworm/pono/HDLC diff --git a/debian-bookworm/pono/Dockerfile b/debian-bookworm/pono/Dockerfile new file mode 100644 index 00000000..a4bd7a48 --- /dev/null +++ b/debian-bookworm/pono/Dockerfile @@ -0,0 +1,48 @@ +# Authors: +# Unai Martinez-Corral +# +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +ARG REGISTRY='gcr.io/hdl-containers/debian/bookworm' + +#--- + +FROM $REGISTRY/build/build AS build + +RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC \ + && mkdir -p /usr/share/man/man1/ \ + && apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install ${makedepends[@]} \ + && apt-get autoclean && apt-get clean && apt-get -y autoremove \ + && update-ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC && build + +#--- + +FROM scratch AS version +COPY --from=build /tmp/hdlc.pono.version / + +#--- + +FROM scratch +COPY --from=build /opt/pono /pono diff --git a/debian-bookworm/pono/HDLC b/debian-bookworm/pono/HDLC new file mode 100644 index 00000000..0e2c1abd --- /dev/null +++ b/debian-bookworm/pono/HDLC @@ -0,0 +1,53 @@ +# HDLC pono + +# Authors: +# Unai Martinez-Corral +# +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +set -e + +makedepends=( + bison + cmake + flex + libbison-dev + libgmp-dev + python3-pyparsing + pkg-config + meson +) + + +build() { + git clone https://github.com/upscale-project/pono.git /tmp/pono + cd /tmp/pono + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' > /tmp/hdlc.pono.version + ./contrib/setup-smt-switch.sh + ./contrib/setup-btor2tools.sh + ./configure.sh + PREFIX=/usr/local + make -C build -j$(nproc) PREFIX="$PREFIX" + DESTDIR=/opt/pono + mkdir -p "${DESTDIR}${PREFIX}"/bin "${DESTDIR}${PREFIX}"/lib + cp build/pono "${DESTDIR}${PREFIX}"/bin/ + cp build/libpono.so "${DESTDIR}${PREFIX}"/lib/ +} From b915f3e8d5cc218e3b596c27f8dc4d83ee45e43d Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Mon, 28 Oct 2024 22:27:28 +0100 Subject: [PATCH 4/7] Add formal to bookworm build, without superprove as that is difficult to get working with bookworm where there is no support for python 2.7 --- debian-bookworm/formal.dockerfile | 84 +++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 debian-bookworm/formal.dockerfile diff --git a/debian-bookworm/formal.dockerfile b/debian-bookworm/formal.dockerfile new file mode 100644 index 00000000..ac27dcc9 --- /dev/null +++ b/debian-bookworm/formal.dockerfile @@ -0,0 +1,84 @@ +# Authors: +# Unai Martinez-Corral +# +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +# ARG REGISTRY='gcr.io/hdl-containers/debian/bookworm' +ARG REGISTRY='localhost/bookworm' + +#--- + +# WORKAROUND: this is required because 'COPY --from' does not support ARGs +FROM $REGISTRY/pkg/z3 AS pkg-z3 +FROM $REGISTRY/pkg/sby AS pkg-sby + +# FROM $REGISTRY/ghdl/yosys AS min +FROM $REGISTRY/pkg/ghdl-yosys AS min + +COPY --from=pkg-z3 /z3 / +COPY --from=pkg-sby /sby / + +RUN apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ + python3 \ + python3-pip \ + python3-click \ + && apt-get autoclean && apt-get clean && apt-get -y autoremove \ +&& rm -rf /var/lib/apt/lists/* +# \ +# && python3 -m pip install click --progress-bar off + +#--- + +# WORKAROUND: this is required because 'COPY --from' does not support ARGs +FROM $REGISTRY/pkg/yices2 AS pkg-yices2 +FROM $REGISTRY/pkg/boolector AS pkg-boolector +FROM $REGISTRY/pkg/cvc AS pkg-cvc +FROM $REGISTRY/pkg/pono AS pkg-pono + +FROM min AS latest + +COPY --from=pkg-yices2 /yices2 / +COPY --from=pkg-boolector /boolector / +COPY --from=pkg-cvc /cvc / +COPY --from=pkg-pono /pono / + +RUN apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ + libgmpxx4ldbl \ + && apt-get autoclean && apt-get clean && apt-get -y autoremove \ + && rm -rf /var/lib/apt/lists/* + +#--- + +# WORKAROUND: this is required because 'COPY --from' does not support ARGs +# FROM $REGISTRY/pkg/superprove AS pkg-superprove + +# FROM latest + +# COPY --from=pkg-superprove /superprove / + +# RUN apt-get update -qq \ +# && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ + # python \ + # libpython2.7 \ +# && apt-get autoclean && apt-get clean && apt-get -y autoremove \ +# && rm -rf /var/lib/apt/lists/* From 83c704b8228cccdc201e62e1a26674e1980a9ce3 Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Wed, 27 Nov 2024 22:01:04 +0100 Subject: [PATCH 5/7] Add docker file to make the superprove image with bookworm --- debian-bookworm/superprove/Dockerfile | 75 ++++++++++++++++++++++ debian-bookworm/superprove/HDLC | 60 +++++++++++++++++ debian-bookworm/superprove/rm-system.patch | 31 +++++++++ debian-bookworm/superprove/suprove | 33 ++++++++++ 4 files changed, 199 insertions(+) create mode 100644 debian-bookworm/superprove/Dockerfile create mode 100644 debian-bookworm/superprove/HDLC create mode 100644 debian-bookworm/superprove/rm-system.patch create mode 100755 debian-bookworm/superprove/suprove diff --git a/debian-bookworm/superprove/Dockerfile b/debian-bookworm/superprove/Dockerfile new file mode 100644 index 00000000..2bd2a9ce --- /dev/null +++ b/debian-bookworm/superprove/Dockerfile @@ -0,0 +1,75 @@ +# Authors: +# Unai Martinez-Corral +# +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +ARG REGISTRY='gcr.io/hdl-containers/debian/bookworm' + +#--- + +FROM $REGISTRY/build/build AS build + +# Create a francendebian with python2.7 from debian bulseye +RUN curl -O http://ftp.debian.org/debian/pool/main/libf/libffi/libffi7_3.3-6_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/python2.7_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-dev_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7_2.7.18-8+deb11u1_amd64.deb + +RUN apt-get update -qq \ +&& apt-get -y install mime-support libexpat1-dev + +RUN dpkg -i libffi7_3.3-6_amd64.deb +RUN dpkg -i libssl1.1_1.1.1w-0+deb11u1_amd64.deb +RUN dpkg -i libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i python2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i python2.7_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i libpython2.7_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i python2.7-dev_2.7.18-8+deb11u1_amd64.deb +# End francendebian installs + + +RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC \ + && apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends ${makedepends[@]} \ + && apt-get autoclean && apt-get clean && apt-get -y autoremove \ + && update-ca-certificates \ + && rm -rf /var/lib/apt/lists/* + #\ + #&& prepare + +RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC && build + +#--- + +FROM scratch AS version +COPY --from=build /tmp/hdlc.superprove.version / + +#--- + +FROM scratch +COPY --from=build /opt/superprove /superprove diff --git a/debian-bookworm/superprove/HDLC b/debian-bookworm/superprove/HDLC new file mode 100644 index 00000000..151b23a6 --- /dev/null +++ b/debian-bookworm/superprove/HDLC @@ -0,0 +1,60 @@ +# HDLC superprove + +# Authors: +# Unai Martinez-Corral +# +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +set -e + +CTX=/tmp/ctx + +makedepends=( + binutils + cmake + ninja-build + patch + # python-setuptools + # python-wheel-common + # python-dev-is-python2 + zlib1g-dev +) + +prepare() { + curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python +} + +build() { + git clone --recursive https://github.com/sterin/super-prove-build /tmp/superprove + cd /tmp/superprove/super_prove + git describe --always | sed 's/\(.*\)/g\1/' > /tmp/hdlc.superprove.version + cd .. + patch -p1 < ${CTX}/rm-system.patch + mkdir build && cd build + PREFIX=/usr/local + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -G Ninja .. + ninja + ninja package + DESTDIR=/opt/superprove + mkdir -p "${DESTDIR}${PREFIX}" + tar -C "${DESTDIR}${PREFIX}" -xzf super_prove*.tar.gz --strip 1 + cp ${CTX}/suprove "${DESTDIR}${PREFIX}"/bin/suprove +} diff --git a/debian-bookworm/superprove/rm-system.patch b/debian-bookworm/superprove/rm-system.patch new file mode 100644 index 00000000..ff713503 --- /dev/null +++ b/debian-bookworm/superprove/rm-system.patch @@ -0,0 +1,31 @@ +# Authors: +# Unai Martinez-Corral +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +diff --git a/cmake/install_rules.cmake b/cmake/install_rules.cmake +index fed7af4..08e0cf5 100644 +--- a/cmake/install_rules.cmake ++++ b/cmake/install_rules.cmake +@@ -62 +61,0 @@ function(install_python_requirements file) +- --system +-- +2.33.0 + diff --git a/debian-bookworm/superprove/suprove b/debian-bookworm/superprove/suprove new file mode 100755 index 00000000..683729fb --- /dev/null +++ b/debian-bookworm/superprove/suprove @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +# Authors: +# Unai Martinez-Corral +# +# +# Torsten Meissner +# Sverre Hamre +# +# Copyright Unai Martinez-Corral +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +tool=super_prove + +if [ "$1" != "${1#+}" ]; then + tool="${1#+}" + shift +fi + +exec ${tool}.sh "$@" From e238597d4418c2da22c6744f4846ba144a50f6eb Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Wed, 27 Nov 2024 22:01:50 +0100 Subject: [PATCH 6/7] update to get yosys built --- debian-bookworm/yosys/HDLC | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bookworm/yosys/HDLC b/debian-bookworm/yosys/HDLC index 61e8c4ad..b709f423 100644 --- a/debian-bookworm/yosys/HDLC +++ b/debian-bookworm/yosys/HDLC @@ -56,4 +56,5 @@ depends=( tcl-dev graphviz xdot + gtkwave ) From eb08d6ef01326e50a268e41e4924954a514339f5 Mon Sep 17 00:00:00 2001 From: Sverre Hamre Date: Wed, 27 Nov 2024 22:02:57 +0100 Subject: [PATCH 7/7] Changes to get ghdl, ghdl-yosys and formal to build. --- debian-bookworm/formal.dockerfile | 39 ++++++++++++++++---- debian-bookworm/ghdl-yosys-plugin.dockerfile | 7 +++- debian-bookworm/ghdl.dockerfile | 10 +++-- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/debian-bookworm/formal.dockerfile b/debian-bookworm/formal.dockerfile index ac27dcc9..53b2fe7e 100644 --- a/debian-bookworm/formal.dockerfile +++ b/debian-bookworm/formal.dockerfile @@ -69,16 +69,41 @@ RUN apt-get update -qq \ #--- -# WORKAROUND: this is required because 'COPY --from' does not support ARGs -# FROM $REGISTRY/pkg/superprove AS pkg-superprove +# WORKAROUND: this is required because 'COPY --from' does not support ARGs# Create a francendebian with python2.7 from debian bulseye +RUN curl -O http://ftp.debian.org/debian/pool/main/libf/libffi/libffi7_3.3-6_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb +RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/python2.7_2.7.18-8+deb11u1_amd64.deb +# RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb +# RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-dev_2.7.18-8+deb11u1_amd64.deb +# RUN curl -O http://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7_2.7.18-8+deb11u1_amd64.deb + +RUN apt-get update -qq \ +&& apt-get -y install mime-support + +RUN dpkg -i libffi7_3.3-6_amd64.deb +RUN dpkg -i libssl1.1_1.1.1w-0+deb11u1_amd64.deb +RUN dpkg -i libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i python2.7-minimal_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i libpython2.7-stdlib_2.7.18-8+deb11u1_amd64.deb +RUN dpkg -i python2.7_2.7.18-8+deb11u1_amd64.deb +# RUN dpkg -i libpython2.7_2.7.18-8+deb11u1_amd64.deb +# RUN dpkg -i libpython2.7-dev_2.7.18-8+deb11u1_amd64.deb +# RUN dpkg -i python2.7-dev_2.7.18-8+deb11u1_amd64.deb +# End francendebian installs + -# FROM latest +FROM $REGISTRY/pkg/superprove AS pkg-superprove -# COPY --from=pkg-superprove /superprove / +FROM latest -# RUN apt-get update -qq \ +COPY --from=pkg-superprove /superprove / + +RUN apt-get update -qq \ # && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ # python \ # libpython2.7 \ -# && apt-get autoclean && apt-get clean && apt-get -y autoremove \ -# && rm -rf /var/lib/apt/lists/* + && apt-get autoclean && apt-get clean && apt-get -y autoremove \ + && rm -rf /var/lib/apt/lists/* diff --git a/debian-bookworm/ghdl-yosys-plugin.dockerfile b/debian-bookworm/ghdl-yosys-plugin.dockerfile index b0ab3832..23a3e2b7 100644 --- a/debian-bookworm/ghdl-yosys-plugin.dockerfile +++ b/debian-bookworm/ghdl-yosys-plugin.dockerfile @@ -19,15 +19,18 @@ # # SPDX-License-Identifier: Apache-2.0 -ARG REGISTRY='gcr.io/hdl-containers/debian/bookworm' +# ARG REGISTRY='gcr.io/hdl-containers/debian/bookworm' +ARG REGISTRY='localhost/bookworm' #--- -FROM $REGISTRY/yosys AS base +FROM $REGISTRY/pkg/yosys AS base RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ libgnat-12 \ + gcc \ + g++ \ && apt-get autoclean && apt-get clean && apt-get -y autoremove \ && rm -rf /var/lib/apt/lists diff --git a/debian-bookworm/ghdl.dockerfile b/debian-bookworm/ghdl.dockerfile index c31cc258..5542b841 100644 --- a/debian-bookworm/ghdl.dockerfile +++ b/debian-bookworm/ghdl.dockerfile @@ -23,7 +23,7 @@ ARG REGISTRY='gcr.io/hdl-containers/debian/bookworm' #--- -FROM ghdl/pkg:bookworm-mcode AS build-mcode +FROM docker.io/ghdl/pkg:bookworm-mcode AS build-mcode # TODO Build GHDL on $REGISTRY/build/build instead of picking ghdl/pkg:bookworm-mcode @@ -35,7 +35,7 @@ COPY --from=build-mcode / /ghdl/usr/local/ #--- -FROM ghdl/pkg:bookworm-llvm-14 AS build-llvm +FROM docker.io/ghdl/pkg:bookworm-llvm-14 AS build-llvm # TODO Build GHDL on $REGISTRY/build/build instead of picking ghdl/pkg:bookworm-llvm-14 @@ -62,10 +62,12 @@ FROM base AS mcode COPY --from=build-mcode / /usr/local/ #-- - + FROM base AS llvm - + COPY --from=build-llvm / /usr/local/ +COPY --from=build-llvm / /ghdl/usr/local/ +COPY --from=build-mcode / /ghdl/usr/local/ RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \