librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Thu 17 Nov 2022 11:24:04 AM CET

Browse source
This commit is contained in:
Bert van der Weerd 2022-11-17 11:24:04 +01:00
parent a5dc42930e
commit 6bcc7e0fc1
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
assets/setup-rust.sh Executable file
View file

@ -0,0 +1,9 @@
#!/bin/sh
set -e
tmpfile=/tmp/tmp.784979489.sh
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > $tmpfile
chmod +x $tmpfile
/bin/sh -c "$tmpfile -y"
rm -f $tmpfile

2
linux-base/Makefile
View file

@ -119,7 +119,7 @@ librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
docker-build : docker-build :
docker build --build-arg "arch=$(arch)" -t $(docker_image_name) - < assets/Dockerfile docker build --no-cache --build-arg "arch=$(arch)" -t $(docker_image_name) - < assets/Dockerfile
docker-run : docker-run :
docker run --rm $(docker_image_name) sh -c "git pull && make fetch && make arch=$(arch) all" docker run --rm $(docker_image_name) sh -c "git pull && make fetch && make arch=$(arch) all"

11
linux-base/assets/Dockerfile
View file

@ -12,10 +12,11 @@ RUN git checkout flatpak
WORKDIR linux-base WORKDIR linux-base
ENV PATH="${PATH}:/root/.cargo/bin" ENV PATH="${PATH}:/root/.cargo/bin"
RUN ( make setup-debian && \
make fetch && \
( make arch=$arch bootstrap ; true ) && \
make arch=$arch bootstrap && \
make veryclean )
#RUN make setup-fedora && make fetch && make arch=$arch bootstrap && make veryclean #RUN make setup-fedora && make fetch && make arch=$arch bootstrap && make veryclean
RUN make setup-debian
RUN make update # this makes it not reproducible
RUN make fetch
RUN sh -c ./assets/setup-rust.sh
RUN make arch=$arch bootstrap
RUN make veryclean