Update MPB, fixup for archlinux packaging changes

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

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.common.env b/.common.env
@@ -8,8 +8,8 @@ WORKDIR=${WORKDIR:=$(realpath $(pwd)/../toolchain/mod-workdir)}
 
 # use a similar matching MOD platform
 case "${PLAT}" in
-  arm) PLAT="modduo-new";;
-  aarch64|arm64) PLAT="modduox-new";;
+  aarch64|arm64) PLAT="generic-aarch64";;
+  x86_64) PLAT="generic-x86_64";;
 esac
 
 #######################################################################################################################
diff --git a/archiso/Dockerfile b/archiso/Dockerfile
@@ -1,5 +1,5 @@
 FROM archlinux:base
-LABEL maintainer="Filipe Coelho <falktx@moddevices.com>"
+LABEL maintainer="Filipe Coelho <falktx@mod.audio>"
 
 # force new keyring, required for installing anything
 RUN pacman -Sy --noconfirm archlinux-keyring && \
@@ -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
@@ -1,11 +1,11 @@
 FROM mpb-toolchain
-LABEL maintainer="Filipe Coelho <falktx@moddevices.com>"
+LABEL maintainer="Filipe Coelho <falktx@mod.audio>"
 ENV DEBIAN_FRONTEND noninteractive
 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/mod-os/build.sh b/mod-os/build.sh
@@ -80,9 +80,9 @@ touch ${WORKDIR}/${PLAT}/target/usr/share/mod/html/mod-ui.css
 touch ${WORKDIR}/${PLAT}/target/usr/share/mod/html/mod-ui.js
 
 # this is needed somehow
-if [ "${PLAT}" = "x86_64" ] && [ ! -e ${WORKDIR}/x86_64/target/usr/lib/libmvec.so.1 ]; then
-    cp ${WORKDIR}/x86_64/toolchain/x86_64-modaudio-linux-gnu/sysroot/lib/libmvec.so.1 \
-       ${WORKDIR}/x86_64/target/usr/lib/libmvec.so.1
+if [ "${PLAT}" = "generic-x86_64" ] && [ ! -e ${WORKDIR}/generic-x86_64/target/usr/lib/libmvec.so.1 ]; then
+    cp ${WORKDIR}/generic-x86_64/toolchain/x86_64-modaudio.generic-linux-gnu/sysroot/lib/libmvec.so.1 \
+       ${WORKDIR}/generic-x86_64/target/usr/lib/libmvec.so.1
 fi
 
 #######################################################################################################################

diff --git a/plugins/Dockerfile b/plugins/Dockerfile
@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV USER builder
 ENV HOME /home/$USER
 
-ARG PLAT=x86_64
+ARG PLAT=generic-x86_64
 
 # run bootstrap (contained within docker)
 RUN ./bootstrap.sh $PLAT && ./.clean-install.sh $PLAT

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