5 files changed, 40 insertions, 21 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 32ea98f..f88140c 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -14,6 +14,8 @@ RAMDISK_EXT_arm ?= ".ext4.gz.u-boot"
 
 OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
 
+export SYSTEMD_USED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', '', d)}"
+
 IMAGE_CMD_ostree () {
         if [ -z "$OSTREE_REPO" ]; then
                 bbfatal "OSTREE_REPO should be set in your local.conf"
@@ -51,13 +53,21 @@ IMAGE_CMD_ostree () {
                 fi
         done
         
-        if [ ! -d "usr/etc/tmpfiles.d" ]; then
-                mkdir usr/etc/tmpfiles.d
+        if [ -n "$SYSTEMD_USED" ]; then
+                mkdir -p usr/etc/tmpfiles.d
+                tmpfiles_conf=usr/etc/tmpfiles.d/00ostree-tmpfiles.conf
+                echo "d /var/rootdirs 0755 root root -" >>${tmpfiles_conf}
+                echo "L /var/rootdirs/home - - - - /sysroot/home" >>${tmpfiles_conf}
+        else
+                mkdir -p usr/etc/init.d
+                tmpfiles_conf=usr/etc/init.d/tmpfiles.sh
+                echo '#!/bin/sh' > ${tmpfiles_conf}
+                echo "mkdir -p /var/rootdirs; chmod 755 /var/rootdirs" >> ${tmpfiles_conf}
+                echo "ln -sf /sysroot/home /var/rootdirs/home" >> ${tmpfiles_conf}
+
+                ln -s ../init.d/tmpfiles.sh usr/etc/rcS.d/S20tmpfiles.sh
         fi
-        tmpfiles_conf=usr/etc/tmpfiles.d/00ostree-tmpfiles.conf
 
-        echo "d /var/rootdirs 0755 root root -" >>${tmpfiles_conf}
-        echo "L /var/rootdirs/home - - - - /sysroot/home" >>${tmpfiles_conf}
         # Preserve data in /home to be later copied to /sysroot/home by
         #   sysroot generating procedure
         mkdir -p usr/homedirs
@@ -74,7 +84,12 @@ IMAGE_CMD_ostree () {
                         if [ "$(ls -A $dir)" ]; then
                                 bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr"
                         fi
-                        echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf}
+
+                        if [ -n "$SYSTEMD_USED" ]; then
+                                echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf}
+                        else
+                                echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf}
+                        fi
                         rm -rf ${dir}
                         ln -sf var/rootdirs/${dir} ${dir}
                 fi
@@ -84,7 +99,13 @@ IMAGE_CMD_ostree () {
                 if [ "$(ls -A root)" ]; then
                         bberror "Data in /root directory is not preserved by OSTree."
                 fi
-                echo "d /var/roothome 0755 root root -" >>${tmpfiles_conf}
+
+                if [ -n "$SYSTEMD_USED" ]; then
+                        echo "d /var/roothome 0755 root root -" >>${tmpfiles_conf}
+                else
+                        echo "mkdir -p /var/roothome; chown 755 /var/roothome" >>${tmpfiles_conf}
+                fi
+
                 rm -rf root
                 ln -sf var/roothome root
         fi
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 5520154..3136092 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -27,9 +27,4 @@ PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 = "u-boot"
 # Some BSPs (e.g. meta-raspberrypi) use this variable to turn debug on/off
 DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "release",d)}"
 
-DISTRO_FEATURES_append = " systemd"
-PREFERRED_PROVIDER_udev ?= "systemd"
-PREFERRED_PROVIDER_udev-utils ?= "systemd"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-
 DISTROOVERRIDES_append = ":sota"
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb
index d444669..b6adf9b 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/recipes-sota/ostree/ostree_git.bb
@@ -14,7 +14,9 @@ S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
 
-DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs systemd"
+DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs"
+DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
+
 DEPENDS_remove_class-native = "systemd-native"
 
 RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz os-release"
@@ -25,7 +27,7 @@ EXTRA_OEMAKE = "CFLAGS='-g'"
 EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat"
 
 SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
-SYSTEMD_REQUIRED_class-native = ""
+SYSTEMD_REQUIRED_class-native = "false"
 
 SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
 SYSTEMD_SERVICE_${PN}_class-native = ""
@@ -52,8 +54,7 @@ do_compile_prepend() {
 export SYSTEMD_REQUIRED
 
 do_install_append() {
- if [ -n ${SYSTEMD_REQUIRED} ]; then
-  install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service
+ if [ "$SYSTEMD_REQUIRED" == "true" ]; then
   install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service
  fi
 }
diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
index 9a7ec10..a9a9c2c 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -21,7 +21,7 @@ FILES_${PN} = " \
                 ${bindir}/system_info.sh \
                 ${sysconfdir}/sota_client.version \
                 ${sysconfdir}/sota_certificates \
-                ${systemd_unitdir}/system/sota_client.service \
+                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client.service', '', d)} \
                 ${bindir}/sota_ostree.sh \
               "
 
@@ -134,8 +134,10 @@ do_install() {
   install -m 0755 run/system_info.sh ${D}${bindir}
   install -m 0755 run/sota_ostree.sh ${D}${bindir}
 
-  install -d ${D}${systemd_unitdir}/system
-  install -c ${S}/run/sota_client.service ${D}${systemd_unitdir}/system
+  if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+    install -d ${D}${systemd_unitdir}/system
+    install -c ${S}/run/sota_client.service ${D}${systemd_unitdir}/system
+  fi
 
   install -d ${D}${sysconfdir}
   install -c ${S}/run/sota_certificates ${D}${sysconfdir}
diff --git a/recipes-support/libgsystem/libgsystem_git.bb b/recipes-support/libgsystem/libgsystem_git.bb
index 181dd42..048c44b 100644
--- a/recipes-support/libgsystem/libgsystem_git.bb
+++ b/recipes-support/libgsystem/libgsystem_git.bb
@@ -9,9 +9,9 @@ S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gobject-introspection
 
-DEPENDS += "attr glib-2.0 pkgconfig libcap"
-RDEPENDS_${PN} = "xz systemd"
+DEPENDS += "attr glib-2.0 pkgconfig libcap xz"
 
+RDEPENDS_${PN}_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
 RDEPENDS_${PN}_remove_class-native = "systemd-native"
 
 BBCLASSEXTEND = "native"