Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove ccache hack from dockerfiles (#1835)

Browse Source 
Now we have a proper solution in cmake
This commit is contained in:
E.T 2024-01-30 21:32:01 +01:00 committed by GitHub
parent c9db21063b
commit 13f12227bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockerfile-nogit
View File

@ -35,13 +35,6 @@ RUN mkdir /opt/build \
&& mkdir armbin \ && mkdir armbin \
&& tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
# Configure CCACHE
RUN mkdir ~/bin \
&& cd ~/bin \
&& for tool in gcc g++ cpp c++; do \
ln -s $(which ccache) arm-none-eabi-$tool \
; done
ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

4
dockerfile-nogit-alpine
View File

@ -19,9 +19,5 @@ RUN apk add --no-cache g++ gcc clang clang-static clang-dev llvm-dev llvm-static
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8 ENV LC_ALL C.UTF-8
# Configure CCACHE
RUN mkdir ~/bin && cd ~/bin && \
for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
CMD cd .. && cd build && \ CMD cd .. && cd build && \
cmake .. && make ppfw cmake .. && make ppfw

7
dockerfile-nogit-arm
View File

@ -35,13 +35,6 @@ RUN mkdir /opt/build \
&& mkdir armbin \ && mkdir armbin \
&& tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin
# Configure CCACHE
RUN mkdir ~/bin \
&& cd ~/bin \
&& for tool in gcc g++ cpp c++; do \
ln -s $(which ccache) arm-none-eabi-$tool \
; done
ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]