Updates not checked in

This commit is contained in:
Philip Smart
2021-08-22 09:49:27 +01:00
parent 074374e61e
commit 6e8fcf9e0a
2 changed files with 22 additions and 13 deletions

View File

@@ -42,8 +42,8 @@ ARG INSTALLATION_DIR=/opt/altera
ARG ALTERA_DOWNLOAD_SITE=http://download.altera.com/akdlm/software/acdsinst
ARG QUARTUS_VERSION_INSTALLER=/17.1std/590/ib_installers/
ARG QUARTUS_VERSION_UPDATE=/17.1std.1/593/update/
#ARG QUARTUS=QuartusSetup-17.1.0.590-linux.run
ARG QUARTUS=QuartusLiteSetup-17.1.0.590-linux.run
ARG QUARTUS=QuartusSetup-17.1.0.590-linux.run
#ARG QUARTUS=QuartusLiteSetup-17.1.0.590-linux.run
ARG QUARTUS_UPDATE=QuartusSetup-17.1.1.593-linux.run
ARG QUARTUS_PROGRAMMER=QuartusProgrammerSetup-17.1.0.590-linux.run
ARG QUARTUS_HELP=QuartusHelpSetup-17.1.0.590-linux.run
@@ -61,6 +61,8 @@ RUN apt-get install --no-install-recommends -y \
libxau-dev:i386 \
libxdmcp-dev:i386 \
libfreetype6:i386 \
libxtst6:i386 \
libxi6:i386 \
fontconfig:i386 \
expat:i386 \
lib32ncurses5-dev \
@@ -89,7 +91,9 @@ RUN apt-get install --no-install-recommends -y \
xvfb \
net-tools \
x11-apps \
aptitude \
vim \
sudo \
firefox
# Setup environment defaults.
@@ -104,19 +108,19 @@ ENV EXEC_DIR ${INSTALLATION_DIR}
#
# PRODUCTION CYCLE, fetch files from Altera as needed.
RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${QUARTUS}
RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_UPDATE}/${QUARTUS_UPDATE}
RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${QUARTUS_PROGRAMMER}
RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${QUARTUS_HELP}
RUN for DEVICE_FILE in ${QUARTUS_DEVICE_FILES}; \
do \
echo "Fetching ${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${DEVICE_FILE}"; \
wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${DEVICE_FILE}; \
done
#RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${QUARTUS}
#RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_UPDATE}/${QUARTUS_UPDATE}
#RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${QUARTUS_PROGRAMMER}
#RUN wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${QUARTUS_HELP}
#RUN for DEVICE_FILE in ${QUARTUS_DEVICE_FILES}; \
# do \
# echo "Fetching ${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${DEVICE_FILE}"; \
# wget -q --directory-prefix=${TARGET_DOWNLOAD_DIR} ${ALTERA_DOWNLOAD_SITE}/${QUARTUS_VERSION_INSTALLER}/${DEVICE_FILE}; \
# done
# DEVELOPMENT CYCLE, quartus files cached locally.
#COPY ./files/17.1/*.qdz ${TARGET_DOWNLOAD_DIR}
#COPY ./files/17.1/*.run ${TARGET_DOWNLOAD_DIR}
COPY ./files/17.1/*.qdz ${TARGET_DOWNLOAD_DIR}
COPY ./files/17.1/*.run ${TARGET_DOWNLOAD_DIR}
# Install Quartus.
RUN chmod +x ${TARGET_DOWNLOAD_DIR}${QUARTUS}
@@ -140,6 +144,11 @@ COPY ./files/quartus_web_rules_file.txt /root/.altera.quartus/
COPY ./files/libjtag_hw_arrow.so ${INSTALLATION_DIR}/quartus/linux64/
COPY ./files/70-usb.rules /etc/udev/rules.d/
# Local upgrades.
COPY local/17.1/license.dat ${INSTALLATION_DIR}/
COPY local/17.1/libsys_cpt.so ${INSTALLATION_DIR}/quartus/linux64/
COPY local/17.1/libgcl_afcq.so ${INSTALLATION_DIR}/quartus/linux64/
# Setup necessary environment variables.
RUN echo "export PATH=\$PATH:${INSTALLATION_DIR}/quartus/bin:${INSTALLATION_DIR}/qprogrammer/bin" >> /root/.bashrc
RUN echo "export LM_LICENSE_FILE=${INSTALLATION_DIR}/license.dat" >> /root/.bashrc

Binary file not shown.