commenting out softconsole for now

develop
penguin 3 months ago
parent 64ca9ed1a1
commit cfae8620a8

@ -12,11 +12,13 @@ ENV LM_LICENSE_FILE="1702@LPOD"
ENV SNPSLMD_LICENSE_FILE="1702@LPOD"
ENV FPGENPROG="${LIBERO_DIR}/Libero/bin64/fpgenprog"
ARG DEBIAN_FRONTEND=noninteractive
ENV XDG_RUNTIME_DIR="/tmp/.xdg/${UID}"
# prepare the install dirs
RUN mkdir -p ${MICROCHIP_TOOLS_DIR}/common
RUN mkdir -p ${MICROCHIP_TOOLS_DIR}/installers
RUN mkdir -p ${MICROCHIP_TOOLS_DIR}/scripts
RUN mkdir -p $XDG_RUNTIME_DIR
RUN dpkg --add-architecture i386 && \
apt-get update -y && \
@ -27,16 +29,17 @@ ADD installers/* ${MICROCHIP_TOOLS_DIR}/installers/
ADD scripts/* ${MICROCHIP_TOOLS_DIR}/scripts/
# run installer in silent mode using config file
RUN echo "Installing Libero... This could take a bit"
RUN ${MICROCHIP_TOOLS_DIR}/installers/Libero_SoC_${LIBERO_VERSION}_Web.bin -f ${MICROCHIP_TOOLS_DIR}/installers/installer.cfg -i silent
RUN ls /opt/microchip
RUN ${MICROCHIP_TOOLS_DIR}/installers/Libero_SoC_${LIBERO_VERSION}_Web.bin -i silent -f ${MICROCHIP_TOOLS_DIR}/installers/installer.cfg
RUN echo "Installing license"
RUN mkdir -p ${LIBERO_LICENSE_DIR}
ADD licenses/* ${LIBERO_LICENSE_DIR}
RUN echo "Installing SoftConsole... This could take a bit"
RUN ${MICROCHIP_TOOLS_DIR}/installers/Microchip-SoftConsole-${SOFTCONSOLE_VERSION}-linux-x64-installer.run \
--mode unattended --unattendedmodeui minimal --installrenodesources "Yes, I accept Renode's MIT license." \
--prefix ${SC_INSTALL_DIR}
# RUN echo "Installing SoftConsole... This could take a bit"
# RUN ${MICROCHIP_TOOLS_DIR}/installers/Microchip-SoftConsole-${SOFTCONSOLE_VERSION}-linux-x64-installer.run \
# --mode unattended --unattendedmodeui minimal --installrenodesources "Yes, I accept Renode's MIT license." \
# --prefix ${SC_INSTALL_DIR}
# 32 bit deps
RUN apt-get install -y libc6:i386 libdrm2:i386 libexpat1:i386 \
@ -68,5 +71,5 @@ RUN apt-get install -y xfonts-100dpi xfonts-75dpi xfonts-base \
RUN bash -c "echo \". ${MICROCHIP_TOOLS_DIR}/scripts/env\"" >> /root/.bashrc
ENTRYPOINT "${MICROCHIP_TOOLS_DIR}/scripts/entrypoint"
CMD "echo \"Got here\""
ENTRYPOINT ["/bin/bash", "-c"]
CMD [".", "/opt/microchip/scripts/entrypoint", "&&"]

@ -5,7 +5,12 @@
# @version 0.1
bash:
podman run -it -h LPOD --volume="/etc/localtime:/etc/localtime" --network podman1 --mac-address ${LIBERO_LICENSE_MAC} --rm -v "${XAUTHORITY}:${XAUTHORITY}:ro" -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e "DISPLAY" --security-opt label=type:container_runtime_t localhost/microchip_tools:latest bash
podman run -it -h LPOD --volume="/etc/localtime:/etc/localtime" --network podman --mac-address ${LIBERO_LICENSE_MAC} -v "${XAUTHORITY}:${XAUTHORITY}:ro" -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e "DISPLAY" --security-opt label=type:container_runtime_t localhost/microchip_tools:latest
libero:
podman run -t -h LPOD --volume="/etc/localtime:/etc/localtime" --network podman --mac-address ${LIBERO_LICENSE_MAC} -v "${XAUTHORITY}:${XAUTHORITY}:ro" -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e "DISPLAY" --security-opt label=type:container_runtime_t localhost/microchip_tools:latest libero
daemon:
podman run -d -h LPOD --volume="/etc/localtime:/etc/localtime" --network podman --mac-address ${LIBERO_LICENSE_MAC} -v "${XAUTHORITY}:${XAUTHORITY}:ro" -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e "DISPLAY" --security-opt label=type:container_runtime_t localhost/microchip_tools:latest /opt/microchip/scripts/entrypoint
# end

@ -2,5 +2,3 @@
. /opt/microchip/scripts/env
${LIBERO_DIR}/Libero/bin64/lmgrd -z -c ${LIBERO_LICENSE_DIR}/License.dat -l ${LIBERO_LOG_DIR}/license.log
exec "$@"

Loading…
Cancel
Save