6 files changed, 70 insertions, 5 deletions

diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 5ec1d18..e334df0 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -1,7 +1,7 @@
 DISTRO_FEATURES_append = " sota"
 OVERRIDES .= ":sota"
 
-IMAGE_INSTALL_append = " ostree os-release"
+IMAGE_INSTALL_append = " ostree os-release rvi-sota-client"
 
 # live image for OSTree-enabled systems
 IMAGE_CLASSES += "image_types_ostree image_types_ota"
@@ -21,3 +21,5 @@ OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
 OSTREE_OSNAME ?= "poky"
 OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
 
+# Prelinking increases the size of downloads and causes build errors
+USER_CLASSES_remove = "image-prelink"
diff --git a/conf/include/local/sota_minnowboard.inc b/conf/include/local/sota_minnowboard.inc
index d39f4d3..36d1a17 100644
--- a/conf/include/local/sota_minnowboard.inc
+++ b/conf/include/local/sota_minnowboard.inc
@@ -6,4 +6,4 @@ EFI_PROVIDER = "grub-efi"
 WKS_FILE = "efiimage-sota.wks"
 IMAGE_BOOT_FILES = ""
 
-OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/mmcblk2p2 console=ttyS0,115200 console=tty0"
+OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 console=ttyS0,115200 console=tty0"
diff --git a/recipes-sota/ostree-initrd/files/init.sh b/recipes-sota/ostree-initrd/files/init.sh
index 806a7b1..1814ca3 100644
--- a/recipes-sota/ostree-initrd/files/init.sh
+++ b/recipes-sota/ostree-initrd/files/init.sh
@@ -29,10 +29,11 @@ get_ostree_sysroot() {
         for opt in `cat /proc/cmdline`; do
                 arg=`echo $opt | cut -d'=' -f1`
                 if [ $arg == "ostree_root" ]; then
-                        echo $opt | cut -d'=' -f2
+                        echo $opt | cut -d'=' -f2-
                         return
                 fi
         done
+        echo "LABEL=otaroot"
 }
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/ostree
diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bb b/recipes-sota/ostree-initrd/ostree-initrd.bb
index 5c85bee..b721405 100644
--- a/recipes-sota/ostree-initrd/ostree-initrd.bb
+++ b/recipes-sota/ostree-initrd/ostree-initrd.bb
@@ -5,15 +5,16 @@ SRC_URI = "file://init.sh"
 
 S = "${WORKDIR}"
 
+PV = "2"
+
 do_install() {
         install -dm 0755 ${D}/etc
         touch ${D}/etc/initrd-release
         install -dm 0755 ${D}/dev
         install -dm 0755 ${D}/sbin
-        install -m 0755 ${WORKDIR}/init.sh ${D}/sbin/init
+        install -m 0755 ${WORKDIR}/init.sh ${D}/sbin/init
 }
 
 inherit allarch
 
 FILES_${PN} += " /dev /etc/initrd-release /sbin/init "
-
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 316a782..6c01d5b 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -49,5 +49,6 @@ else
         cat ${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc >> conf/bblayers.conf
         echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf
         echo "include conf/distro/sota.conf.inc" >> conf/local.conf
+        echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
 fi
 
diff --git a/scripts/qa b/scripts/qa
new file mode 100755
index 0000000..e5133f0
--- /dev/null
+++ b/scripts/qa
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+
+from subprocess import Popen, PIPE
+from glob import glob
+from os.path import dirname, join, abspath, exists
+from os import chdir
+import signal
+
+root = abspath(dirname(dirname(dirname(__file__))))
+print("Root dir is:" + root)
+
+args = ['bitbake', 'core-image-minimal']
+
+
+class Runner(object):
+    UNKNOWN = 'unknown'
+    PASS = 'pass'
+    FAIL = 'fail'
+    SKIP = 'skipped'
+
+    def __init__(self, dirs):
+        self._dirs = dirs
+        self._child = None
+        self._results = {}
+        for d in dirs:
+            self._results[d] = self.UNKNOWN
+
+    def run(self):
+        for d in self._dirs:
+            chdir(d)
+            if exists(join(d, '.qaskip')):
+                print("Skipping %s because of .qaskip file" % d)
+                self._results[d] = self.SKIP
+                continue
+            print("Building in " + d)
+            self._child = Popen(args=args, cwd=d, stdin=PIPE)
+            retcode = self._child.wait()
+            self._child = None
+            if retcode == 0:
+                self._results[d] = self.PASS
+            else:
+                self._results[d] = self.FAIL
+                print("Error, stopping qa script at %s" % d)
+                break
+        for d, result in self._results.items():
+            print("%20s %s" % (d, result))
+
+    def handle_signal(self, signo, stack_frame):
+        if self._child:
+            self._child
+
+
+def main():
+    dirs = glob(join(root, 'build*'))
+    runner = Runner(dirs)
+    signal.signal(signalnum=signal.SIGINT, handler=runner.handle_signal)
+    runner.run()
+
+if __name__ == "__main__":
+    main()