Update MPB, fixup for archlinux packaging changes

Signed-off-by: falkTX <falktx@falktx.com>
moddevices · Jan 3, 2024 · 8fd41e6 · 8fd41e6
1 parent 2080810
commit 8fd41e6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/archiso/Dockerfile b/archiso/Dockerfile
@@ -13,7 +13,7 @@ RUN pacman pacman -Syuu --noconfirm && pacman -Scc
 
 # install packages for archiso and live-welcome
 RUN pacman -Syu --noconfirm arch-install-scripts dosfstools e2fsprogs libisoburn mtools squashfs-tools && \
-    pacman -Syu --noconfirm gcc git jack2 kparts make patch pkg-config qt5-webengine && \
+    pacman -Syu --noconfirm gcc git jack2 kparts5 make patch pkg-config qt5-webengine qt5-x11extras && \
     pacman -Scc
 
 # misc setup

diff --git a/archiso/liveusb/packages.x86_64 b/archiso/liveusb/packages.x86_64
@@ -5,7 +5,7 @@ amd-ucode
 base
 bash
 breeze
-cardinal-jack
+cardinal-standalone
 cloud-init
 cpupower
 edk2-shell

diff --git a/mod-os/Dockerfile b/mod-os/Dockerfile
@@ -5,7 +5,7 @@ ENV USER builder
 ENV HOME /home/$USER
 
 # NOTE you can edit this as needed
-ENV MPB_COMMIT_HASH_FOR_MOD_OS 4d410a0c6d08fb24bdfa50e7a710605fb2e26ad1
+ENV MPB_COMMIT_HASH_FOR_MOD_OS 0a26f578d7de19646f21a3e27eda5cf562f2fa83
 
 # update to requested commit
 RUN git checkout . && git checkout master && git pull && git checkout $MPB_COMMIT_HASH_FOR_MOD_OS && git submodule update

diff --git a/plugins/mod-plugin-builder b/plugins/mod-plugin-builder
diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile
@@ -46,7 +46,7 @@ RUN mkdir $HOME/mod-workdir
 
 # mod-plugin-builder settings
 ENV MPB_GIT_URL https://github.com/moddevices/mod-plugin-builder
-ENV MPB_GIT_HASH 4d410a0c6d08fb24bdfa50e7a710605fb2e26ad1
+ENV MPB_GIT_HASH 0a26f578d7de19646f21a3e27eda5cf562f2fa83
 
 # checkout mod-plugin-builder
 RUN git clone $MPB_GIT_URL