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

push to build on main branch

Browse source
This commit is contained in:
Bert van der Weerd 2022-11-03 14:33:38 +01:00
parent 90d7782acd
commit 9bd9ddc5ad
No known key found for this signature in database
GPG key ID: 73370A0B9E5516B0
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
linux-base/Makefile
View file

@ -16,7 +16,7 @@ ifeq ($(arch),)
arch:=x86_64 arch:=x86_64
endif endif
docker_image_name=lw-linux-base-$(arch) docker_image_name=linux-base-$(arch)
help : help :
@ -82,8 +82,6 @@ veryclean : clean
# this is the place to apply patches and create a custom mozconfig # this is the place to apply patches and create a custom mozconfig
pre-build : pre-build :
mv -v librewolf-$(full_version)/mozconfig librewolf-$(full_version)/mozconfig.std
cp -v assets/mozconfig.$(arch) librewolf-$(full_version)/mozconfig
./assets/pre_build_patches_mozconfig.sh ./assets/pre_build_patches_mozconfig.sh
build : dir build : dir
@ -112,6 +110,9 @@ librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
rm -rf $@ rm -rf $@
tar xf $< tar xf $<
touch $@ touch $@
# we include the standard mozconfig from our $(arch)-specific one
mv librewolf-$(full_version)/mozconfig librewolf-$(full_version)/mozconfig.std
cp assets/mozconfig.$(arch) librewolf-$(full_version)/mozconfig

8
linux-base/assets/Dockerfile
View file

@ -10,6 +10,12 @@ RUN git clone https://gitlab.com/librewolf-community/browser/bsys5
WORKDIR bsys5 WORKDIR bsys5
RUN git checkout flatpak RUN git checkout flatpak
WORKDIR linux-base WORKDIR linux-base
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-debian && make fetch && 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