push to build on main branch
This commit is contained in:
parent
90d7782acd
commit
9bd9ddc5ad
2 changed files with 11 additions and 4 deletions
|
|
@ -16,7 +16,7 @@ ifeq ($(arch),)
|
|||
arch:=x86_64
|
||||
endif
|
||||
|
||||
docker_image_name=lw-linux-base-$(arch)
|
||||
docker_image_name=linux-base-$(arch)
|
||||
|
||||
|
||||
help :
|
||||
|
|
@ -82,8 +82,6 @@ veryclean : clean
|
|||
|
||||
# this is the place to apply patches and create a custom mozconfig
|
||||
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
|
||||
|
||||
build : dir
|
||||
|
|
@ -112,6 +110,9 @@ librewolf-$(full_version) : librewolf-$(full_version).source.tar.gz
|
|||
rm -rf $@
|
||||
tar xf $<
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,12 @@ RUN git clone https://gitlab.com/librewolf-community/browser/bsys5
|
|||
WORKDIR bsys5
|
||||
RUN git checkout flatpak
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue