.oniro-ci/build-generic.yaml

@@ -35,8 +35,8 @@
         echo "CI_ONIRO_MANIFEST_URL: $CI_ONIRO_MANIFEST_URL"
         echo "CI_ONIRO_MANIFEST_NAME: $CI_ONIRO_MANIFEST_NAME"
         echo "CI_ONIRO_MANIFEST_BRANCH: $CI_ONIRO_MANIFEST_BRANCH"
-        repo init --reference \
-           "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE"/pub/git-repo-mirrors/"$CI_ONIRO_MANIFEST_MIRROR" \
+        repo init \
+           $(test -n "${CI_ONIRO_RUNNER_PERSISTENT_STORAGE:-}" && echo --reference "$CI_ONIRO_RUNNER_PERSISTENT_STORAGE"/pub/git-repo-mirrors/"$CI_ONIRO_MANIFEST_MIRROR") \
            --manifest-url "$CI_ONIRO_MANIFEST_URL" \
            --manifest-name "$CI_ONIRO_MANIFEST_NAME" \
            --manifest-branch "$CI_ONIRO_MANIFEST_BRANCH"
@@ -162,6 +162,17 @@
           | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' \
           | sort \
           | tee -a conf/local.conf )
+    # Variables in the form of '^CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_attr' are
+    # converted to 'attr += "value"' and appended to bblayers.conf
+    # this is useful if layer has to be added but bitbake add-layer command cannot be used 
+    # (for example this layer's class is inherited via local.conf already)
+    - |
+      ( set +o pipefail;
+        env \
+          | grep -E '^CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_[A-Z_0-9]+=' \
+          | sed -e 's/^CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' \
+          | sort \
+          | tee -a conf/bblayers.conf )
 
     # Sanity check: disallow using public build cache with a specific setting
     # in local.conf. The list of settings may grow over time.
@@ -254,27 +265,30 @@
     # subdirectories.
     - mkdir -p "$CI_PROJECT_DIR"/artifacts
     - rm -rf "$CI_PROJECT_DIR"/artifacts/*
-    # The name of the build-specific tmp directory may vary. Ask bitbake
-    # instead of hard-coding it. This is currently only relevant for Zephyr,
-    # which uses tmp-newlib.
-    - eval "$(bitbake -e | grep ^TMPDIR= | sed -e 's/^TMPDIR/BITBAKE_TMPDIR/g')"
+    # The name of the build-specific deploy dir may vary. Ask bitbake instead
+    # of hard-coding it.
+    - eval "$(bitbake -e | grep ^DEPLOY_DIR= | sed -e 's/^DEPLOY_DIR/BITBAKE_DEPLOY_DIR/g')"
     # Uncompressed wic image is not needed in CI. We cannot remove it from
     # meta-oniro-core/classes/oniro-image.bbclass as runqemu needs it for local
     # build and boot.
-    - find "$BITBAKE_TMPDIR"/deploy/images/ -name *.wic -exec rm -rf {} \;
-    - cp -a "$BITBAKE_TMPDIR"/deploy/licenses/ "$CI_PROJECT_DIR"/artifacts || true
+    - find "$BITBAKE_DEPLOY_DIR"/images/ -name *.wic -exec rm -rf {} \;
+    - cp -a "$BITBAKE_DEPLOY_DIR"/licenses/ "$CI_PROJECT_DIR"/artifacts || true
     # Only copy the files defined in the CI_ONIRO_JOB_ARTIFACTS variable. Most
     # of the remaining files are redundant and quite large.
     - |
       set -x
-      if test -n "$CI_ONIRO_JOB_ARTIFACTS" && test -d "$BITBAKE_TMPDIR"/deploy/; then
+      if test -n "$CI_ONIRO_JOB_ARTIFACTS" && test -d "$BITBAKE_DEPLOY_DIR"; then
         (
-          cd "$BITBAKE_TMPDIR"/deploy/
+          cd "$BITBAKE_DEPLOY_DIR"
           for artifact in $CI_ONIRO_JOB_ARTIFACTS; do
             find ./ \( -type f -o -type l \) -name "$artifact" -exec cp --verbose --archive --parents {} "$CI_PROJECT_DIR"/artifacts \;
           done
         )
       fi
+      # Compress and copy artifacts of do_abicheck task (if any)
+      if test -n "$CI_ONIRO_ABICHECK_TOPDIR" && test -d "$BITBAKE_TMPDIR"/../"$CI_ONIRO_ABICHECK_TOPDIR"; then
+            tar -cJf "$CI_PROJECT_DIR"/artifacts/abicheck-"$CI_COMMIT_SHA".tar.xz "$BITBAKE_TMPDIR"/../"$CI_ONIRO_ABICHECK_TOPDIR"/*/*/binaryaudit
+      fi
       set +x
   artifacts:
     paths:
@@ -399,6 +413,14 @@
 .build:
  extends: .build-recipe
 
+.check-abi:
+  variables:
+    CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: abicheck
+    CI_ONIRO_BB_LOCAL_CONF_BINARY_AUDIT_WARN_ONLY: "1"
+    CI_ONIRO_MANIFEST_NAME: manifests/ci.xml
+    CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_BBLAYERS: "../meta-binaryaudit"
+    CI_ONIRO_ABICHECK_TOPDIR: "./buildhistory/packages"
+
 # This job is documented in docs/ci/hidden-jobs/build-docs.rst
 .build-docs:
   interruptible: true

.oniro-ci/containers/bitbake-builder/Dockerfile

@@ -26,8 +26,8 @@ RUN apt-get update -qq \
 	bash git-repo git-lfs apt-utils build-essential chrpath cpio diffstat \
 	gawk git sudo wget language-pack-en-base time locales python-is-python3 \
 	python3-distutils python3-pip libssl-dev iproute2 iputils-ping curl jq \
-	lz4 zstd \
- && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.04.2' \
+	lz4 zstd iptables\
+ && eatmydata apt-get install -qq -y 'ca-certificates=20211016~20.04.1' \
  && eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN locale-gen
 RUN pip3 install anybadge
@@ -36,7 +36,12 @@ RUN pip3 install anybadge
 RUN echo "dash dash/sh boolean false" | debconf-set-selections \
  && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
 
-RUN useradd --create-home --uid 1000 --shell /usr/bin/bash builder
+# runqemu command needs sudo permission to create tun device for the
+# communication between host and vm for gcc testing.
+RUN useradd --create-home --uid 1000 --shell /usr/bin/bash builder \
+ && usermod -aG sudo builder\
+ && echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
 COPY --chown=builder:builder .gitconfig /home/builder/.gitconfig
 USER builder
 WORKDIR /home/builder

.oniro-ci/machines-and-flavours.yaml

@@ -32,7 +32,7 @@
       allow_failure: true
 
 .linux-qemu-x86:
-  extends: .build-wic-image
+  extends: [.build-wic-image, .check-abi]
   variables:
     MACHINE: qemux86
     CI_ONIRO_BUILD_FLAVOUR: linux
@@ -51,7 +51,7 @@ linux-qemu-x86-clang:
  extends: [.linux-qemu-x86, .toolchain-clang]
 
 .linux-qemu-x86_64:
-  extends: .build-wic-image
+  extends: [.build-wic-image, .check-abi]
   variables:
     MACHINE: qemux86-64
     CI_ONIRO_BUILD_FLAVOUR: linux
@@ -129,7 +129,7 @@ linux-seco-imx8mm-c61-4gb-extra-clang:
   extends: [.linux-seco-imx8mm-c61-4gb-extra, .toolchain-clang, .broken]
 
 .linux-raspberrypi4-64:
-  extends: .build-wic-image
+  extends: [.build-wic-image, .check-abi]
   variables:
     MACHINE: raspberrypi4-64
     CI_ONIRO_BUILD_FLAVOUR: linux

docs/build-flavours/linux-flavour.rst

@@ -47,7 +47,7 @@ After successful bootup, you will be dropped into a login shell:
 
     qemux86-64 login:
     
-Default login is *root* without a password.
+The default login name is **oniro** with **oniro** as a password.
 
 After login you will see the shell prompt:
 

docs/debug-mode.rst

+.. SPDX-FileCopyrightText: Huawei Inc.
+..
+.. SPDX-License-Identifier: CC-BY-4.0
+
+.. include:: definitions.rst
+
+.. _DebugMode:
+
+Debug Mode
+##########
+
+In some situations, you may want to compile an image with some additional tools
+and features for easier debugging. For this reason, |main_project_name|
+offers the debug mode.
+
+Images built with the `debug mode` enabled contain additional tools and allow
+to log in as root (which is disabled in the default images).
+
+To enable the `debug mode`, edit your ``local.conf`` and add:
+
+.. code-block:: console
+
+    INHERIT += "oniro-debug-linux"
+
+For convenience, the section is already present commented-out in the template
+and you may uncoment it.
+
+When done, rebuild your image as usual. To go back to the production mode,
+comment the line out again and rebuild your image.
+
+.. Note::
+
+   Debug mode images are unsupported by the project and do not take part
+   of the release. They are provided for convenience only.

docs/hardware-support/boards/arduino-nano-33-ble.rst

@@ -74,6 +74,12 @@ sample application, *blinky*. In order to do so issue the following:
 3. After the build completes, the ``zephyr-philosophers.bin`` and the ``zephyr-blinky.bin``
    file can be found in ``build-oniro-zephyr/tmp-newlib/deploy/images/arduino-nano-33-ble/``.
 
+.. note::
+    By default, both zephyr-blinky and zephyr-philosophers applications will start once the board 
+    is powered on without waiting for a serial console connection.
+    To start an application only when serial console is connected, specify ONIRO_ENABLE_ACM0 = "1".
+    This option may be useful in automated testing environment.
+
 Flashing an Application
 =======================
 

docs/hardware-support/boards/raspberrypi4.rst

@@ -84,7 +84,7 @@ Linux image
    can be found in
    ``build-oniro-linux-raspberrypi4-64/tmp/deploy/images/$MACHINE/``.
    The key file which is needed to flash into the SD card is
-   ``oniro-image-base-raspberrypi4-64.wic.bz2``.
+   ``oniro-image-base-raspberrypi4-64.wic.gz``.
 
 Flashing |main_project_name| Linux image
 ****************************************
@@ -104,7 +104,7 @@ describes booting the board with an SD card option.
 .. code-block:: console
 
    $ cd tmp/deploy/images/raspberrypi4-64
-   $ bmaptool copy oniro-image-base-raspberrypi4-64.wic.bz2 $DEVNODE
+   $ bmaptool copy oniro-image-base-raspberrypi4-64.wic.gz $DEVNODE
 
 2. Put the card to the board and turn it on.
 

docs/hardware-support/boards/seco-intel-b68.rst

@@ -86,7 +86,7 @@ steps:
 .. code-block:: console
 
    $ cd tmp/deploy/images/seco-intel-b68
-   $ bmaptool copy oniro-image-base-seco-intel-b68.wic.bz2 $DEVNODE
+   $ bmaptool copy oniro-image-base-seco-intel-b68.wic.gz $DEVNODE
 
 3. Put the card to the board and turn it on.
 

docs/index.rst

@@ -40,4 +40,5 @@ Build System Guide
    :caption: Troubleshoot
    :maxdepth: 2
 
-   fallback-devices-support 
+   fallback-devices-support
+   debug-mode

docs/oniro-quick-build.rst

@@ -72,21 +72,33 @@ cloned using the repo tool. See above.
    could use around 100GB of disk space for downloads, temporary files, and
    build artifacts combined.
 
-Initialize the build directory and run a build:
+Initialize the build directory:
 
 .. code-block:: console
 
     $ TEMPLATECONF=../oniro/flavours/linux . ./oe-core/oe-init-build-env build-oniro-linux
+
+Now that the build is initialized, you have the choice of building a standard
+Oniro image or an OpenHarmony compatible one.
+
+A. Standard Oniro image
+-----------------------
+
+All that is left is to run the build:
+
+.. code-block:: console
+
     $ MACHINE=qemux86-64 bitbake oniro-image-base
 
 .. _Building with OpenHarmony:
 
-Building with OpenHarmony compatibility
-***************************************
+B. Building with OpenHarmony compatibility
+------------------------------------------
 
-To enable OpenHarmony compatibility, before running the last `bitbake` command
-in the section above, you have to add the following to
-`build-oniro-linux/conf/local.conf` file:
+To enable OpenHarmony compatibility features, you need to tweak the
+`local.conf` file before running the build process. You will find this
+configuration in `build-oniro-linux/conf/local.conf` where you'll need to add
+the following:
 
 .. code-block:: sh
 
@@ -98,8 +110,11 @@ in the section above, you have to add the following to
 This will enable OpenHarmony features and add OpenHarmony Standard System
 features to the `oniro-image-base` image.
 
-With that in place, the image can be built with the instructions in the
-:ref:`Building an Oniro image <Building an Oniro image>` section above.
+All that is left is to run the build:
+
+.. code-block:: console
+
+    $ MACHINE=qemuarm bitbake oniro-image-base
 
 Booting a Qemu X86-64 Target with a |main_project_name| image
 *************************************************************
@@ -112,3 +127,5 @@ Once the image is built, you can run a Qemu X86-64 instance using the provided s
 
 If the host has a VT-capable CPU, you can pass the ``kvm`` argument for better
 performance. Check ``runqemu``'s help message for all available arguments.
+
+The default user name is **oniro** with **oniro** as a password.

docs/supported-images.rst

@@ -4,7 +4,7 @@
 
 .. include:: definitions.rst
 
-Supported images
+Supported Images
 ################
 
 To create a custom Linux distribution to match the product requirements, 

flavours/linux/conf-notes.txt

@@ -26,5 +26,6 @@ or via command line, e.g.:
 
 You can also run generated qemu images with a command:
 
-    $ runqemu qemux86-64 qemuparams="-nographic" oniro-image-base wic ovmf
+    $ runqemu qemux86-64 qemuparams="-nographic" oniro-image-base wic ovmf slirp
 
+Then log in as 'oniro' user with 'oniro' as a password.

manifests/ci.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: Huawei Inc.
+-->
+<manifest>
+  <include name="manifests/default.xml" />
+  <project name="oniro-core/meta-binaryaudit" remote="eclipse" revision="oniro/kirkstone" path="meta-binaryaudit" />
+</manifest>

meta-oniro-staging/recipes-connectivity/tayga/tayga_0.9.2.bb

@@ -8,7 +8,7 @@ DESCRIPTION = "TAYGA is an out-of-kernel stateless NAT64 implementation for \
     kernel. It is intended to provide production-quality NAT64 service for \
     networks where dedicated NAT64 hardware would be overkill."
 SECTION = "net"
-LICENSE="GPLv2"
+LICENSE="GPL-2.0-only"
 LIC_FILES_CHKSUM="file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI= "http://www.litech.org/tayga/tayga-0.9.2.tar.bz2 \