diff --git a/Containerfile b/Containerfile index 8594aa8..f5fa8b4 100644 --- a/Containerfile +++ b/Containerfile @@ -53,7 +53,6 @@ RUN git clone https://github.com/supersurviveur/prjxray.git && \ # prjxray dependency not available on apk RUN pip install textx --break-system-packages -# RUN fasm2frames # Install the zynq7 prjxray database RUN git clone https://github.com/f4pga/prjxray-db.git && \ cd prjxray-db && \ @@ -78,15 +77,6 @@ RUN git clone https://github.com/YosysHQ/nextpnr && \ -DUSE_OPENMP=ON && \ make -C build -# This part is specific to djtgcfg but it doesn't detect the card over USB (missing driver ?) -# # Install djtgcfg -# # Install avahi (djtcfg dependency) -# RUN apk add avahi -# RUN git clone https://aur.archlinux.org/digilent.adept.runtime.git && \ -# cd digilent.adept.runtime && makepkg -si --noconfirm --needed -# RUN git clone https://aur.archlinux.org/digilent.adept.utilities.git && \ -# cd digilent.adept.utilities && makepkg -si --noconfirm --needed - # Install sv2v RUN git clone https://github.com/zachjs/sv2v && \ cd sv2v && \ @@ -104,17 +94,13 @@ RUN copy_bin_deps.sh /home/root/aur-install/prjxray/build/tools/xc7frames2bit RUN copy_bin_deps.sh /home/root/aur-install/sv2v/bin/sv2v RUN cp /usr/bin/fasm2frames /dependencies/usr/bin/ -# djtgcfg -# RUN copy_bin_deps.sh /usr/bin/djtgcfg -# RUN copy_bin_deps.sh /usr/bin/dftdrvdtch - # Final image FROM alpine:edge # Install dependencies available in apk RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ apk update && \ - apk add abc py3-yaml py3-simplejson py3-intervaltree py3-arpeggio + apk add abc py3-yaml py3-simplejson py3-intervaltree py3-arpeggio openfpgaloader # Get dependencies back COPY --from=builder /dependencies / @@ -130,13 +116,6 @@ COPY --from=builder /usr/lib/python3.12/site-packages/prjxray /usr/lib/python3.1 COPY --from=builder /usr/lib/python3.12/site-packages/fasm /usr/lib/python3.12/site-packages/fasm COPY --from=builder /usr/lib/python3.12/site-packages/textx /usr/lib/python3.12/site-packages/textx -# This part is specific to djtgcfg but it doesn't detect the card over USB (missing driver ?) -# COPY --from=builder /usr/share/digilent /usr/share/digilent -# COPY --from=builder /etc/digilent-adept.conf /etc/digilent-adept.conf -# COPY --from=builder /etc/ld.so.conf.d/digilent-adept-libraries.conf /etc/ld.so.conf.d/digilent-adept-libraries.conf -# Generate ld configuration for digilent programs -# RUN ldconfig - WORKDIR /root/code CMD ["/bin/bash -c \"$@\""]