From 00a97e22b3d02112fc556499b53821b6a39ead1f Mon Sep 17 00:00:00 2001 From: Marlon Beijer Date: Thu, 13 Feb 2020 17:59:03 +0100 Subject: [PATCH] Put all images on same level Update toolchains submodule --- common.docker | 27 ++++++++++++++++++--------- dependencies/toolchains | 2 +- m68k-amigaos.docker | 3 ++- ppc-amigaos.docker | 5 ++++- ppc-morphos.docker | 5 ++++- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/common.docker b/common.docker index 0cf3d60..3f0ffc8 100644 --- a/common.docker +++ b/common.docker @@ -1,10 +1,8 @@ +# START COMMON MAINTAINER Marlon Beijer "marlon@amigadev.com" - -RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkg-config lhasa +RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y RUN echo "root:root" | chpasswd - RUN ln -s /opt/${CROSS_PFX} /tools - ENV CROSS_ROOT /opt/${CROSS_PFX} WORKDIR /work @@ -16,12 +14,23 @@ COPY imagefiles/entrypoint.sh /entry/ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \ LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \ - AR=${CROSS_ROOT}/bin/${CROSS_PFX}-ar \ - CC=${CROSS_ROOT}/bin/${CROSS_PFX}-gcc \ - CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \ + AR=${CROSS_ROOT}/bin/${CROSS_PFX}-ar \ + CC=${CROSS_ROOT}/bin/${CROSS_PFX}-gcc \ + CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \ RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib - + +RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \ + ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ar /usr/bin/ar && \ + ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ld /usr/bin/ld && \ + ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-gcc /usr/bin/gcc && \ + ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-g++ /usr/bin/g++ && \ + ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib + COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ +COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules +RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ +RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr -ENV PATH ${PATH}:${CROSS_ROOT}/bin \ No newline at end of file +ENV PATH ${PATH}:${CROSS_ROOT}/bin +# END COMMON diff --git a/dependencies/toolchains b/dependencies/toolchains index 6b8d3ce..fb2f1ac 160000 --- a/dependencies/toolchains +++ b/dependencies/toolchains @@ -1 +1 @@ -Subproject commit 6b8d3ced2b8a0cf1bf51256efb46617d45437207 +Subproject commit fb2f1acdfc6ae7f415765729c81a3162437b8651 diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker index 377721f..eac1597 100644 --- a/m68k-amigaos.docker +++ b/m68k-amigaos.docker @@ -3,6 +3,7 @@ FROM amigadev/m68k-amigaos-gcc:latest as build-env FROM amigadev/docker-base:latest ENV CROSS_PFX m68k-amigaos +ENV OS_NAME AmigaOS # Temporary fix COPY --from=build-env /opt/amiga /opt/${CROSS_PFX} @@ -39,7 +40,7 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \ COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ -RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/AmigaOS.cmake +RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV PATH ${PATH}:${CROSS_ROOT}/bin diff --git a/ppc-amigaos.docker b/ppc-amigaos.docker index 6469704..964f520 100644 --- a/ppc-amigaos.docker +++ b/ppc-amigaos.docker @@ -3,12 +3,12 @@ FROM amigadev/adtools:latest as build-env FROM amigadev/docker-base:latest ENV CROSS_PFX ppc-amigaos +ENV OS_NAME AmigaOS COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX} # START COMMON MAINTAINER Marlon Beijer "marlon@amigadev.com" - RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y RUN echo "root:root" | chpasswd RUN ln -s /opt/${CROSS_PFX} /tools @@ -36,6 +36,9 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \ ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ +COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules +RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ +RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV PATH ${PATH}:${CROSS_ROOT}/bin diff --git a/ppc-morphos.docker b/ppc-morphos.docker index 9fee5ff..914cb12 100644 --- a/ppc-morphos.docker +++ b/ppc-morphos.docker @@ -3,12 +3,12 @@ FROM amigadev/morphos-cross-toolchain:latest as build-env FROM amigadev/docker-base:latest ENV CROSS_PFX ppc-morphos +ENV OS_NAME MorphOS COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX} # START COMMON MAINTAINER Marlon Beijer "marlon@amigadev.com" - RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y RUN echo "root:root" | chpasswd RUN ln -s /opt/${CROSS_PFX} /tools @@ -36,6 +36,9 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \ ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ +COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules +RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ +RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr ENV PATH ${PATH}:${CROSS_ROOT}/bin