From 9bd9ddc5ad11d1e4269c8910c4986cb58d049fae Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 3 Nov 2022 14:33:38 +0100
Subject: [PATCH] push to build on main branch

---
 linux-base/Makefile          | 7 ++++---
 linux-base/assets/Dockerfile | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/linux-base/Makefile b/linux-base/Makefile
index db1228a..ea67e34 100644
--- a/linux-base/Makefile
+++ b/linux-base/Makefile
@@ -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
 
 
 
diff --git a/linux-base/assets/Dockerfile b/linux-base/assets/Dockerfile
index b85d8f9..b4a580c 100644
--- a/linux-base/assets/Dockerfile
+++ b/linux-base/assets/Dockerfile
@@ -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