Update MPB, fixup for archlinux packaging changes

Signed-off-by: falkTX <[email protected]>

Author: falkTX

.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
 
 #######################################################################################################################

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
           make toolchain
       - name: pack toolchain
         run: |
-          tar -C ${{ env.WORKDIR }} -czf workdir-toolchain-${{ env.CACHE_VERSION }}.tar.gz x86_64
+          tar -C ${{ env.WORKDIR }} -czf workdir-toolchain-${{ env.CACHE_VERSION }}.tar.gz generic-x86_64
       - uses: actions/upload-artifact@v3
         with:
           name: workdir-toolchain-${{ env.CACHE_VERSION }}
@@ -57,7 +57,7 @@ jobs:
           make bootstrap
       - name: pack bootstrap
         run: |
-          tar -C ${{ env.WORKDIR }} -czf workdir-bootstrap-${{ env.CACHE_VERSION }}.tar.gz x86_64
+          tar -C ${{ env.WORKDIR }} -czf workdir-bootstrap-${{ env.CACHE_VERSION }}.tar.gz generic-x86_64
       - uses: actions/upload-artifact@v3
         with:
           name: workdir-bootstrap-${{ env.CACHE_VERSION }}
@@ -93,7 +93,7 @@ jobs:
           make mod-os
       - name: pack mod-os
         run: |
-          tar -C ${{ env.WORKDIR }} -czf workdir-mod-os-${{ env.CACHE_VERSION }}.tar.gz x86_64
+          tar -C ${{ env.WORKDIR }} -czf workdir-mod-os-${{ env.CACHE_VERSION }}.tar.gz generic-x86_64
       - uses: actions/upload-artifact@v3
         with:
           name: workdir-mod-os-${{ env.CACHE_VERSION }}
@@ -181,7 +181,7 @@ jobs:
           touch bootstrap/.stamp_built
           touch plugins/.stamp_built
           touch mod-os/.stamp_built
-          ln -sf ${{ env.WORKDIR }}/x86_64/images/rootfs.ext2 mod-os/rootfs.ext2
+          ln -sf ${{ env.WORKDIR }}/generic-x86_64/images/rootfs.ext2 mod-os/rootfs.ext2
           make iso
       - uses: actions/upload-artifact@v3
         with:

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

archiso/liveusb/packages.x86_64

@@ -5,7 +5,7 @@ amd-ucode
 base
 bash
 breeze
-cardinal-jack
+cardinal-standalone
 cloud-init
 cpupower
 edk2-shell

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

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
 
 #######################################################################################################################

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

plugins/mod-plugin-builder

@@ -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