Merge pull request #261 from pohly/merge-prs

Merge multiple PRs in one

Author: pohly

bitbake

@@ -232,11 +232,11 @@ To enable UEFI Secure Boot signing globally for all profiles, set:
 
 in ``conf/local.conf``. To use a custom DB key, additionally set:
 
-``REFKIT_DB_KEY``
-``REFKIT_DB_CERT``
+``SECURE_BOOT_SIGNING_KEY``
+``SECURE_BOOT_SIGNING_CERT``
 
-The signing tool uses a 2048bit RSA private key (``REFKIT_DB_KEY``) and a
-PEM formatted X.509 signature (``REFKIT_DB_CERT``). When deploying the DB
+The signing tool uses a 2048bit RSA private key (``SECURE_BOOT_SIGNING_KEY``) and a
+PEM formatted X.509 signature (``SECURE_BOOT_SIGNING_CERT``). When deploying the DB
 keys on the device, use the DER formatted X.509. See ``meta-refkit/files/secureboot/gen-keys-helper.sh`` for more details on how the test keys can be created.
 
 Firewall support

doc/security.rst

@@ -100,12 +100,45 @@ fi
 # to run. This makes it possible to investigate signature changes in post-build.sh.
 bitbake -S none ${_bitbake_targets}
 
-if [ ! -z ${JOB_NAME+x} ]; then
-  # CI run: save output to log file
-  bitbake ${_bitbake_targets} 2>&1 | tee -a $WORKSPACE/$CI_LOG
-else
-  bitbake ${_bitbake_targets}
-fi
+bitbake_build () {
+  local targets="$@"
+  if [ ! -z ${JOB_NAME+x} ]; then
+    # CI run: save output to log file
+    bitbake $targets 2>&1 | tee -a $WORKSPACE/$CI_LOG
+  else
+    bitbake $targets
+  fi
+}
+
+# Main build.
+bitbake_build ${_bitbake_targets}
+
+# Now that the main build phase is done, also build some variants.
+# We can do that in parallel, but we have to use different TMPDIRs,
+# because otherwise files that need to be different because of
+# the different distro features would overwrite each other.
+multiconfig_features="x11 wayland"
+for feature in $multiconfig_features; do
+    mkdir -p conf/multiconfig
+    cat >conf/multiconfig/$feature.conf <<EOF
+require conf/distro/include/refkit-core-$feature.inc
+TMPDIR .= "-$feature"
+# We cannot un-inherit buildhistory at this point?
+# Use a different directory because of https://bugzilla.yoctoproject.org/show_bug.cgi?id=11839
+BUILDHISTORY_DIR_append = "-$feature"
+BUILDHISTORY_COMMIT = "0"
+EOF
+done
+echo "BBMULTICONFIG = '$multiconfig_features'" >>conf/auto.conf
+
+# For each of these images there has to be a recipe in
+# meta-refkit-core/recipes-selftest/images. We could also
+# export tests for DAFT here.
+multiconfig_targets="multiconfig:x11:refkit-image-common-x11 multiconfig:wayland:refkit-image-common-wayland"
+bitbake_build $multiconfig_targets
+
+# TODO: publish-project.sh needs to be adapted. For example, it only
+# rsyncs detailed logs from tmp-glibc, but not tmp-glibc-11 or tmp-glibc-wayland.
 
 if [ ! -z ${JOB_NAME+x} ]; then
   # in CI run only:

docker/build-project.sh

@@ -48,7 +48,7 @@ bitbake -S none ${_images}
 # Check linux-intel specifically in addition to images, because it did
 # rebuild at some point and even though bitbake-diffsigs should
 # recurse to it, that's not guaranteed to work.
-for target in linux-intel ${_images}; do
+for target in intel-linux ${_images}; do
   if ! bitbake-diffsigs -t $target do_build; then
     echo "$target: nothing changed or bitbake-diffsigs failed"
   fi

docker/post-build.sh

@@ -1,3 +1,8 @@
+'''
+This test case tests that OpenCV python interface
+can capture image from the camera using the 
+funtions from the OpenCV HighGUI component. 
+'''
 import cv2 as cv
 import sys
 

meta-intel

@@ -1,3 +1,8 @@
+'''
+This test case tests that OpenCV python interface
+can detect triangle shape from an image using the 
+funtions from the OpenCV CV component. 
+'''
 import os
 import cv2 as cv
 import numpy as np

meta-iotqa/lib/oeqa/runtime/multimedia/opencv/files/cv_capture_video.py

@@ -1,3 +1,8 @@
+'''
+This test case tests that OpenCV python interface
+can perform image processing on an image using the 
+funtions from the OpenCV CV component. 
+'''
 import os
 import cv2 as cv
 

meta-iotqa/lib/oeqa/runtime/multimedia/opencv/files/cv_detect_shape.py

@@ -1,3 +1,8 @@
+'''
+This test case tests that OpenCV python interface
+can read image from file system using the 
+funtions from the OpenCV HighGUI component. 
+'''
 import os
 import cv2 as cv
 

meta-iotqa/lib/oeqa/runtime/multimedia/opencv/files/cv_process_image.py

@@ -2,7 +2,18 @@
 from oeqa.oetest import oeRuntimeTest
 
 class OpenCVTest(oeRuntimeTest):
-
+    '''
+    This test suite tests the 3 main OpenCV components 
+    (CV, HighGUI, CXCore). Tests for Machine Learning 
+    component is not included at the moment.
+    
+    CV component that contains image processing.
+    HighGUI component that contains I/O routines that
+    interact with operating system, the file system, 
+    and hardware such as cameras.
+    CXCore that contains basic data structure.         
+    '''
+    
     cv_read_image = 'cv_read_image.py'
     cv_capture_video = 'cv_capture_video.py'
     cv_process_image = 'cv_process_image.py'
@@ -21,9 +32,6 @@ class OpenCVTest(oeRuntimeTest):
     def setUp(self):
         '''
         Copy all necessary files for test to the target device.
-        @fn setUp
-        @param self
-        @return
         '''
         self.target.copy_to(
             os.path.join(
@@ -56,28 +64,29 @@ def setUp(self):
                 OpenCVTest.cv_image_src),
             OpenCVTest.cv_image_src_target)
 
+    # Test that OpenCV can read image file from file system
     def test_cv_read_image(self):
         (status, output) = self.target.run('python %s' % OpenCVTest.cv_read_image_target)
         self.assertEqual(status, 0, msg="Error messages: %s" % output)
 
+    # Test that OpenCV can capture image from camera 
     def test_cv_capture_video(self):
         (status, output) = self.target.run('python %s 0' % OpenCVTest.cv_capture_video_target)
         self.assertEqual(status, 0, msg="Error messages: %s" % output)
 
+    # Test that OpenCV can perform image processing to an existing image  
     def test_cv_process_image(self):
         (status, output) = self.target.run('python %s' % OpenCVTest.cv_process_image_target)
         self.assertEqual(status, 0, msg="Error messages: %s" % output)
 
+    # Test that OpenCV can detect triangle shape inside an existing image
     def test_cv_detect_shape(self):
         (status, output) = self.target.run('python %s' % OpenCVTest.cv_detect_shape_target)
         self.assertEqual(status, 0, msg="Error messages: %s" % output)
 
     def tearDown(self):
         '''
         Clean work: remove all the files copied to the target device.
-        @fn tearDown
-        @param self
-        @return
         '''
         self.target.run(
             'rm -f %s %s %s %s %s' %