Fix running in new systems

Signed-off-by: falkTX <falktx@falktx.com>

mod-os/overlay-files/tmpfiles.d/legacy.conf

@@ -7,32 +7,5 @@
 
 # See tmpfiles.d(5) for details
 
-# These files are considered legacy and are unnecessary on legacy-free
-# systems.
-
-d /run/lock 0755 root root -
-L /var/lock - - - - ../run/lock
-
-# /run/lock/subsys is used for serializing SysV service execution, and
-# hence without use on SysV-less systems.
-
-d /run/lock/subsys 0755 root root -
-
-# /run/lock/lockdev is used to serialize access to tty devices via
-# LCK..xxx style lock files, For more information see:
-# http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html
-# On modern systems a BSD file lock is a better choice if
-# serialization is needed on those devices.
-
-d /run/lock/lockdev 0775 root lock -
-
 # needed for network.service
 d /run/network 0755 root root -
-
-# /forcefsck, /fastboot and /forcequotecheck are deprecated in favor of the
-# kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and
-# 'quotacheck.mode=force'
-
-r! /forcefsck
-r! /fastboot
-r! /forcequotacheck

mod-os/start.sh

@@ -164,7 +164,16 @@ fi
 if [ -e /mnt/mod-os/etc/fstab ]; then
     NSPAWN_OPTS+=" --directory=/mnt/mod-os"
 else
-    NSPAWN_OPTS+=" --image=$(realpath $(pwd)/rootfs.ext2)"
+    # FIXME systemd-nspawn fails to mount ext2 image with EINVAL
+    # NSPAWN_OPTS+=" --image=$(realpath $(pwd)/rootfs.ext2)"
+
+    if [ -e /mnt/mod-live-usb/etc/fstab ]; then
+        sudo umount /mnt/mod-live-usb
+    else
+        sudo mkdir -p /mnt/mod-live-usb
+    fi
+    sudo mount $(realpath $(pwd)/rootfs.ext2) /mnt/mod-live-usb
+    NSPAWN_OPTS+=" --directory=/mnt/mod-live-usb"
 fi
 
 echo "starting up, pwd is $(pwd)"

plugins/Makefile

@@ -7,7 +7,6 @@ PROJECTS += aidadsp-lv2
 PROJECTS += amsynth
 PROJECTS += artyfx
 PROJECTS += bolliedelay
-# PROJECTS += calf # FIXME use qemu tricks
 PROJECTS += caps-lv2
 PROJECTS += carla-plugins
 PROJECTS += chow-centaur
@@ -67,7 +66,6 @@ PROJECTS += modmeter
 PROJECTS += modspectre
 PROJECTS += notes-lv2
 PROJECTS += neural-amp-modeler-lv2
-#PROJECTS += pitchtracking-series # FIXME use qemu tricks
 PROJECTS += remaincalm-plugins
 PROJECTS += rkrlv2
 # PROJECTS += samplv1
@@ -89,19 +87,31 @@ PROJECTS += x42-stepseq
 PROJECTS += x42-tinygain
 PROJECTS += x42-xfade
 PROJECTS += x42-zconvo
-# PROJECTS += zam-plugins # FIXME use qemu tricks
 # not in stable/prod, but still useful for many reasons
 PROJECTS += crypt
 PROJECTS += bolliedelayxt
 PROJECTS += dexed-labs
 PROJECTS += dm-graindelay
 PROJECTS += portal-lv2
 PROJECTS += x42-tuna-lv2-labs
-# PROJECTS += zynaddsubfx-labs # FIXME use qemu tricks
 # not in stable/prod, not ready no modgui, but I still want it
 # PROJECTS += chow-kick
 # PROJECTS += distrho-ports-v6
 
+# FIXME use qemu tricks
+ifeq ($(PLAT),modduo-new)
+XPLA_COMPAT = true
+else ifeq ($(PLAT),modduox-new)
+XPLA_COMPAT = true
+endif
+
+ifeq ($(XPLA_COMPAT),true)
+PROJECTS += calf
+PROJECTS += pitchtracking-series
+PROJECTS += zam-plugins
+PROJECTS += zynaddsubfx-labs
+endif
+
 # function to convert project name into buildroot var name
 BUILDROOT_VAR = $(shell echo $(1) | tr a-z A-Z | tr - _)