From 39db982fca117ccc65cef5983d1df33bf2194528 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 3 Jan 2024 09:11:30 +0100 Subject: [PATCH] Update MPB, fixup for archlinux packaging changes Signed-off-by: falkTX --- .common.env | 4 ++-- .github/workflows/build.yml | 8 ++++---- archiso/Dockerfile | 4 ++-- archiso/liveusb/packages.x86_64 | 2 +- mod-os/Dockerfile | 4 ++-- mod-os/build.sh | 6 +++--- plugins/Dockerfile | 2 +- plugins/mod-plugin-builder | 2 +- toolchain/Dockerfile | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.common.env b/.common.env index 3433e47..99c46be 100644 --- 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/.github/workflows/build.yml b/.github/workflows/build.yml index f8b1994..5dbbc7a 100644 --- a/.github/workflows/build.yml +++ b/.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: diff --git a/archiso/Dockerfile b/archiso/Dockerfile index 4da89dc..efd08b7 100644 --- a/archiso/Dockerfile +++ b/archiso/Dockerfile @@ -1,5 +1,5 @@ FROM archlinux:base -LABEL maintainer="Filipe Coelho " +LABEL maintainer="Filipe Coelho " # 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 index ee4bd07..6221f2c 100644 --- 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 index a6de0c5..2d2a556 100644 --- a/mod-os/Dockerfile +++ b/mod-os/Dockerfile @@ -1,11 +1,11 @@ FROM mpb-toolchain -LABEL maintainer="Filipe Coelho " +LABEL maintainer="Filipe Coelho " 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 index 7d82bbd..9537fb5 100755 --- 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 index fdd19ae..119c6bd 100644 --- 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 index b3fbd16..0a26f57 160000 --- a/plugins/mod-plugin-builder +++ b/plugins/mod-plugin-builder @@ -1 +1 @@ -Subproject commit b3fbd1686778f33ff2c928be37ee468400c64cea +Subproject commit 0a26f578d7de19646f21a3e27eda5cf562f2fa83 diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile index 63f5948..432e272 100644 --- 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