Merge pull request #12 from advancedtelematic/feat/nosystemd

Make systemd optional

5 files changed, 102 insertions, 100 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..0acc6c6 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -8,97 +8,90 @@ inherit cargo systemd
 
 S = "${WORKDIR}/git"
 
-SRCREV = "72e6096d9122cde2d9ece4e2693bd470e2b57abe"
+SRCREV = "7fa3b3e088ed002d8d99b5496c5755f0fb358ab0"
 
 # Generate with:
 #   git describe --tags | cut -b2-
-PV = "v0.2.22-4-g72e6096"
+PV = "0.2.23-5-g7fa3b3e"
 
 BBCLASSEXTEND = "native"
 
 FILES_${PN} = " \
-                ${bindir}/sota_client \
-                ${bindir}/system_info.sh \
-                ${sysconfdir}/sota_client.version \
-                ${sysconfdir}/sota_certificates \
-                ${systemd_unitdir}/system/sota_client.service \
-                ${bindir}/sota_ostree.sh \
+                /usr/bin/sota_client \
+                /usr/bin/sota_sysinfo.sh \
+                /etc/sota_client.version \
+                /etc/sota_certificates \
+                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client.service', '', d)} \
               "
 
 SRC_URI = " \
 crate://crates.io/aho-corasick/0.5.3 \
-crate://crates.io/time/0.1.35 \
-crate://crates.io/url/1.2.1 \
-crate://crates.io/ws2_32-sys/0.2.1 \
-crate://crates.io/hyper/0.9.4 \
-crate://crates.io/log/0.3.6 \
-crate://crates.io/unicase/1.4.0 \
-crate://crates.io/bitflags/0.7.0 \
 crate://crates.io/bit-set/0.2.0 \
-crate://crates.io/lazy_static/0.2.1 \
-crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/typeable/0.1.2 \
-crate://crates.io/pkg-config/0.3.8 \
-crate://crates.io/httparse/1.1.2 \
-crate://crates.io/openssl/0.8.3 \
-crate://crates.io/user32-sys/0.2.0 \
-crate://crates.io/regex/0.1.77 \
-crate://crates.io/unicode-normalization/0.1.2 \
-crate://crates.io/idna/0.1.0 \
-crate://crates.io/unicode-bidi/0.2.3 \
-crate://crates.io/rand/0.3.14 \
-crate://crates.io/gcc/0.3.37 \
+crate://crates.io/bit-vec/0.4.3 \
+crate://crates.io/bitflags/0.4.0 \
+crate://crates.io/bitflags/0.7.0 \
+crate://crates.io/bytes/0.3.0 \
+crate://crates.io/cfg-if/0.1.0 \
+crate://crates.io/chan-signal/0.1.7 \
 crate://crates.io/chan/0.1.18 \
-crate://crates.io/kernel32-sys/0.2.2 \
-crate://crates.io/winapi/0.2.8 \
+crate://crates.io/cookie/0.2.5 \
 crate://crates.io/crossbeam/0.2.10 \
-crate://crates.io/bitflags/0.4.0 \
-crate://crates.io/thread-id/2.0.0 \
-crate://crates.io/mime/0.2.2 \
-crate://crates.io/thread_local/0.2.7 \
-crate://crates.io/utf8-ranges/0.1.3 \
-crate://crates.io/net2/0.2.26 \
 crate://crates.io/dbus/0.4.1 \
-crate://crates.io/winapi-build/0.1.1 \
-crate://crates.io/chan-signal/0.1.7 \
-crate://crates.io/bit-vec/0.4.3 \
-crate://crates.io/toml/0.2.1 \
-crate://crates.io/quick-error/0.2.2 \
-crate://crates.io/ws/0.5.3 \
-crate://crates.io/traitobject/0.0.1 \
-crate://crates.io/cfg-if/0.1.0 \
-crate://crates.io/matches/0.1.3 \
+crate://crates.io/env_logger/0.3.5 \
+crate://crates.io/gcc/0.3.39 \
+crate://crates.io/gdi32-sys/0.2.0 \
 crate://crates.io/getopts/0.2.14 \
-crate://crates.io/sha1/0.2.0 \
-crate://crates.io/openssl-sys/0.7.17 \
-crate://crates.io/cookie/0.2.5 \
-crate://crates.io/libressl-pnacl-sys/2.1.6 \
+crate://crates.io/hpack/0.2.0 \
+crate://crates.io/httparse/1.2.1 \
+crate://crates.io/hyper/0.9.13 \
+crate://crates.io/idna/0.1.0 \
+crate://crates.io/kernel32-sys/0.2.2 \
 crate://crates.io/language-tags/0.2.2 \
-crate://crates.io/semver/0.1.20 \
-crate://crates.io/unix_socket/0.5.0 \
+crate://crates.io/lazy_static/0.1.16 \
+crate://crates.io/lazy_static/0.2.2 \
+crate://crates.io/libc/0.2.18 \
+crate://crates.io/log/0.3.6 \
+crate://crates.io/matches/0.1.4 \
 crate://crates.io/memchr/0.1.11 \
-crate://crates.io/gdi32-sys/0.2.0 \
-crate://crates.io/nom/1.2.4 \
+crate://crates.io/mime/0.2.2 \
 crate://crates.io/mio/0.5.1 \
-crate://crates.io/tempdir/0.3.5 \
 crate://crates.io/miow/0.1.3 \
-crate://crates.io/pnacl-build-helper/1.4.10 \
-crate://crates.io/libc/0.2.17 \
+crate://crates.io/net2/0.2.26 \
 crate://crates.io/nix/0.5.1 \
+crate://crates.io/nom/1.2.4 \
+crate://crates.io/num_cpus/1.2.0 \
+crate://crates.io/openssl-sys/0.9.3 \
+crate://crates.io/openssl/0.9.3 \
+crate://crates.io/pkg-config/0.3.8 \
+crate://crates.io/rand/0.3.15 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/rust-crypto/0.2.36 \
+crate://crates.io/rustc-serialize/0.3.22 \
 crate://crates.io/rustc_version/0.1.7 \
+crate://crates.io/semver/0.1.20 \
+crate://crates.io/sha1/0.2.0 \
 crate://crates.io/slab/0.1.3 \
-crate://crates.io/rustc-serialize/0.3.19 \
-crate://crates.io/env_logger/0.3.5 \
-crate://crates.io/vecio/0.1.0 \
-crate://crates.io/rotor/0.6.3 \
-crate://crates.io/openssl-sys-extras/0.7.14 \
-crate://crates.io/regex-syntax/0.3.7 \
-crate://crates.io/bytes/0.3.0 \
-crate://crates.io/void/1.0.2 \
-crate://crates.io/spmc/0.2.1 \
-crate://crates.io/openssl-verify/0.1.0 \
-crate-index://crates.io/7670a5aa394d0dcd7598905b352d1634ca74d84a \
+crate://crates.io/solicit/0.4.4 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/time/0.1.35 \
+crate://crates.io/toml/0.2.1 \
+crate://crates.io/traitobject/0.0.1 \
+crate://crates.io/typeable/0.1.2 \
+crate://crates.io/unicase/1.4.0 \
+crate://crates.io/unicode-bidi/0.2.3 \
+crate://crates.io/unicode-normalization/0.1.2 \
+crate://crates.io/unix_socket/0.5.0 \
+crate://crates.io/url/1.2.3 \
+crate://crates.io/user32-sys/0.2.0 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/ws/0.5.3 \
+crate://crates.io/ws2_32-sys/0.2.1 \
 git://github.com/advancedtelematic/rvi_sota_client \
+crate-index://crates.io/213b1a455d9270888c03a42c8d29975369102caa \
 "
 SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4"
 SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913"
@@ -113,30 +106,22 @@ RDEPENDS_${PN} = " libcrypto \
                    lshw \
                    jq \
                    "
-export SOTA_VERSION = "${PV}"
 
 do_compile_prepend() {
-  # Fetch and build the specific build of hyper that is specified in cargo.toml.
-  # meta-rust doesn't support fetching crates that don't point to a specific tag
-  # and rvi-sota-client needs a specific work-around to function correctly.
-  make rust-openssl
-}
-
-do_compile_append() {
-  # Ensure that the 'make rust-openssl' above resulted in the local build of
-  # rust-openssl being used rather than the default one.
-  strings target/${TARGET_SYS}/release/sota_client | grep ${EXTENDPE}${PV}-${PR}/git/rust-openssl -q || (bberror "local rust-open ssl package not used"; exit 1)
+  export SOTA_VERSION=$(make sota-version)
 }
 
 do_install() {
   install -d ${D}${bindir}
   install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir}
-  install -m 0755 run/system_info.sh ${D}${bindir}
-  install -m 0755 run/sota_ostree.sh ${D}${bindir}
+  install -m 0755 run/sota_sysinfo.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}
+  echo `git log -1 --pretty=format:%H` > ${D}${sysconfdir}/sota_client.version
   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"