.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,8 +162,6 @@
           | 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 )
-    # Print local conf for debugging.
-    - grep -E '^[^#]' conf/local.conf
 
     # Sanity check: disallow using public build cache with a specific setting
     # in local.conf. The list of settings may grow over time.
@@ -206,6 +204,7 @@
     # Linux builds can be extremely large. Use rm_work to remove the temporary
     # build data as soon as possible to reclaim space.
     CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: "rm_work"
+    CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: create-spdx
   script:
     - test -n "$CI_ONIRO_BITBAKE_TARGETS" || (
         echo "nothing to build - CI_ONIRO_BITBAKE_TARGETS is empty"
@@ -224,23 +223,6 @@
     matrix:
       - CI_ONIRO_BITBAKE_TARGETS: ["oniro-image-base-tests", "oniro-image-extra-tests"]
 
-# This job is documented in docs/ci/hidden-jobs/build-zephyr.rst
-.build-zephyr:
-  extends: .bitbake-workspace
-  variables:
-    CI_ONIRO_BUILD_FLAVOUR: zephyr
-    CI_ONIRO_BITBAKE_TARGETS: "zephyr-philosophers"
-    CI_ONIRO_INSTANCE_SIZE: s3.large.2
-  script:
-    - test -n "$CI_ONIRO_BITBAKE_TARGETS" || (
-        echo "nothing to build - CI_ONIRO_BITBAKE_TARGETS is empty"
-        && exit 1 )
-    - !reference [.bitbake-workspace, script]
-    - |
-      for target in $CI_ONIRO_BITBAKE_TARGETS; do
-        time bitbake "$target"
-      done
-
 # This job is documented in docs/ci/hidden-jobs/build-freertos.rst
 .build-freertos:
   extends: .bitbake-workspace
@@ -301,11 +283,7 @@
 .build-wic-image:
   extends: .build-image
   variables:
-    # cve-check is enabled in the .bitbake-workspace job. Append
-    # oniro-debug-linux for all wic image build jobs to enable root login which
-    # is required in LAVA test jobs. The variable can be overwritten in build
-    # job level for builds that require non-root user.
-    CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: "cve-check oniro-debug-linux"
+    CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: create-spdx
     CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap"
   script:
     - !reference [.build-image, script]
@@ -405,9 +383,16 @@
 .build-zephyr-image:
   extends: .build-image
   variables:
+    CI_ONIRO_BUILD_FLAVOUR: zephyr
+    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
+    CI_ONIRO_INSTANCE_SIZE: s3.large.2
     CI_ONIRO_JOB_ARTIFACTS: "*.elf *.bin"
   script:
     - !reference [.build-image, script]
+    - echo 'INHERIT += "create-spdx"' >> conf/local.conf
+    - echo 'do_create_spdx[nostamp] = "1"' >> conf/local.conf
+    - echo 'do_create_runtime_spdx[nostamp] = "1"' >> conf/local.conf
+    - bitbake --runall=do_create_runtime_spdx $CI_ONIRO_RECIPE_NAME
 
 # This job is currently used to customize the behavior in oniro and xts-acts.
 # It will be removed when that is safe to do so. It is not documented.

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

@@ -146,9 +146,6 @@ linux-raspberrypi4-64-clang:
     # See the note on linux-qemu-x86.
     CI_ONIRO_BUILD_CACHE: "pub"
     CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
-    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
-    CI_ONIRO_BUILD_FLAVOUR: zephyr
-    CI_ONIRO_INSTANCE_SIZE: s3.large.2
 zephyr-qemu-x86-gcc:
   extends: [.zephyr-qemu-x86, .toolchain-gcc]
 zephyr-qemu-x86-clang:
@@ -161,9 +158,6 @@ zephyr-qemu-x86-clang:
     # See the note on linux-qemu-x86.
     CI_ONIRO_BUILD_CACHE: "pub"
     CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
-    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
-    CI_ONIRO_BUILD_FLAVOUR: zephyr
-    CI_ONIRO_INSTANCE_SIZE: s3.large.2
 zephyr-qemu-cortex-m3-gcc:
   extends: [.zephyr-qemu-cortex-m3, .toolchain-gcc]
 zephyr-qemu-cortex-m3-clang:
@@ -173,9 +167,6 @@ zephyr-qemu-cortex-m3-clang:
   extends: .build-zephyr-image
   variables:
     MACHINE: 96b-nitrogen
-    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
-    CI_ONIRO_BUILD_FLAVOUR: zephyr
-    CI_ONIRO_INSTANCE_SIZE: s3.large.2
 zephyr-96b-nitrogen-gcc:
   extends: [.zephyr-96b-nitrogen, .toolchain-gcc]
 zephyr-96b-nitrogen-clang:
@@ -186,20 +177,16 @@ zephyr-96b-nitrogen-clang:
   variables:
     MACHINE: 96b-nitrogen
     CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-all
-    CI_ONIRO_BUILD_FLAVOUR: zephyr
-    CI_ONIRO_INSTANCE_SIZE: s3.large.2
 zephyr-96b-nitrogen-tests-gcc:
   extends: [.zephyr-96b-nitrogen-tests, .toolchain-gcc]
 zephyr-96b-nitrogen-tests-clang:
   extends: [.zephyr-96b-nitrogen-tests, .toolchain-clang, .broken]
 
 .zephyr-96b-nitrogen-twister:
-  extends: .build-image
+  extends: .build-zephyr-image
   variables:
     MACHINE: 96b-nitrogen
     CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-twister
-    CI_ONIRO_BUILD_FLAVOUR: zephyr
-    CI_ONIRO_INSTANCE_SIZE: s3.large.2
     CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2"
 zephyr-96b-nitrogen-twister-gcc:
   extends: [.zephyr-96b-nitrogen-twister, .toolchain-gcc]
@@ -207,7 +194,7 @@ zephyr-96b-nitrogen-twister-clang:
   extends: [.zephyr-96b-nitrogen-twister, .toolchain-clang, .broken]
 
 .zephyr-96b-avenger:
-  extends: .build-zephyr
+  extends: .build-zephyr-image
   variables:
     MACHINE: 96b-avenger96
 zephyr-96b-avenger-gcc:
@@ -216,7 +203,7 @@ zephyr-96b-avenger-clang:
   extends: [.zephyr-96b-avenger, .toolchain-clang, .broken]
 
 .zephyr-nrf52840dk-nrf52840:
-  extends: .build-zephyr
+  extends: .build-zephyr-image
   variables:
     MACHINE: nrf52840dk-nrf52840
 zephyr-nrf52840dk-nrf52840-gcc:
@@ -225,7 +212,7 @@ zephyr-nrf52840dk-nrf52840-clang:
   extends: [.zephyr-nrf52840dk-nrf52840, .toolchain-clang, .broken]
 
 .zephyr-arduino-nano-33-ble:
-  extends: .build-zephyr
+  extends: .build-zephyr-image
   variables:
     MACHINE: arduino-nano-33-ble
 zephyr-arduino-nano-33-ble-gcc:

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/ci/hidden-jobs/build-zephyr-image.rst

@@ -6,10 +6,12 @@
 .build-zephyr-image
 ===================
 
-The ``.build-zephyr-image`` job extends the :doc:`build-image` job to collect only
+The ``.build-zephyr-image`` job extends the :doc:`build-image` job to collect, by default
 the `*.bin` and `*.elf` files and remove all the other files that would
-normally be collected by the artifact system. It is recommended for Zephyr
-builds which produce bin and elf images.
+normally be collected by the artifact system. The file types of the artifacts can be overridden.
+This sets by default ``CI_ONIRO_BUILD_FLAVOUR`` to ``zephyr`` and ``CI_ONIRO_RECIPE_NAME``
+to ``zephyr-philosophers``, the latter can be overridden to change the recipe builded by bitbake.
+It is used by all Zephyr builds.
 
 Usage Guide
 ===========

docs/ci/hidden-jobs/build-zephyr.rst

-.. SPDX-FileCopyrightText: Huawei Inc.
-..
-.. SPDX-License-Identifier: CC-BY-4.0
-
-=============
-.build-zephyr
-=============
-
-The ``.build-zephyr`` job extends the :doc:`bitbake-workspace` job. It sets
-``CI_ONIRO_BUILD_FLAVOUR`` to ``zephyr`` and builds the bitbake targets (e.g.
-images) as defined by ``CI_ONIRO_BITBAKE_TARGETS`` (defaults included).
-
-Usage Guide
-===========
-
-This job is not intended for direct use. Instead it serves as a base for all
-the Zephyr-specific :doc:`../machines-and-flavours`.

docs/ci/hidden-jobs/index.rst

@@ -18,7 +18,6 @@ implementation details.
    bitbake-workspace
    build-linux
    build-linux-matrix
-   build-zephyr
    build-freertos
    build-recipe
    build-image

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

@@ -55,6 +55,8 @@ Initialize a repo workspace and clone all required repositories:
     $ repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git -b kirkstone
     $ repo sync --no-clone-bundle
 
+.. _Building an Oniro image:
+
 Building an Oniro image
 ***********************
 
@@ -77,6 +79,28 @@ Initialize the build directory and run a build:
     $ TEMPLATECONF=../oniro/flavours/linux . ./oe-core/oe-init-build-env build-oniro-linux
     $ MACHINE=qemux86-64 bitbake oniro-image-base
 
+.. _Building with OpenHarmony:
+
+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:
+
+.. code-block:: sh
+
+    TOOLCHAIN="clang"
+    RUNTIME="llvm"
+    DISTRO_FEATURES:append = " openharmony"
+    IMAGE_INSTALL:append = " openharmony-standard"
+
+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.
+
 Booting a Qemu X86-64 Target with a |main_project_name| image
 *************************************************************
 
@@ -88,3 +112,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/bblayers.conf.sample

@@ -18,6 +18,7 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-zephyr/meta-zephyr-bsp \
   ##OEROOT##/../meta-zephyr/meta-zephyr-core \
   ##OEROOT##/../oniro/meta-oniro-core \
+  ##OEROOT##/../meta-openharmony \
   ##OEROOT##/../meta-freertos \
   ##OEROOT##/../meta-intel \
   ##OEROOT##/../meta-seco-intel \
@@ -32,4 +33,5 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-security \
   ##OEROOT##/../meta-riscv \
   ##OEROOT##/../meta-rauc \
+  ##OEROOT##/../meta-java \
   "

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/default.xml

@@ -25,19 +25,20 @@ SPDX-FileCopyrightText: Huawei Inc.
 	<remote name="seco" fetch="https://git.seco.com" />
 
 	<project name="bitbake" remote="openembedded" revision="b8fd6f5d9959d27176ea016c249cf6d35ac8ba03" path="bitbake" />
-	<project name="openembedded-core" remote="openembedded" revision="eea52e0c3d24c79464f4afdbc3c397e1cb982231" path="oe-core" />
-	<project name="meta-openembedded" remote="openembedded" revision="fcc7d7eae82be4c180f2e8fa3db90a8ab3be07b7" path="meta-openembedded" />
+	<project name="openembedded-core" remote="openembedded" revision="a4bfb5ceb5cf8c0c6d27225b27ef10c0b9dceccb" path="oe-core" />
+	<project name="meta-openembedded" remote="openembedded" revision="b9bbc38bfba702194a71c5a9dcb747ddacc9d66b" path="meta-openembedded" />
 	<project name="aehs29/meta-freertos" remote="github" revision="98a6838261d36b8f79c5fbae1736492169727a1e" path="meta-freertos" />
-	<project name="meta-intel" remote="yocto" revision="8e472da759cd5a5bf2ece041d2796db56b1d5482" path="meta-intel" />
+	<project name="meta-intel" remote="yocto" revision="ef3aa3064b9bbfa19f600eafb1e7d3473f62af74" path="meta-intel" />
 	<project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" />
-	<project name="meta-freescale" remote="yocto" revision="92df6b76f38397b75ea76d588935b5b91b63c58c" path="meta-freescale" />
+	<project name="meta-freescale" remote="yocto" revision="e3e56878708c3c4a7d9dfaa4b369e5869a227a70" path="meta-freescale" />
 	<project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="b6976d806dad5cff6e071cfdb59ab45c4210604b" path="meta-seco-imx" />
 	<project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" />
 	<project name="meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f" path="meta-security" />
 	<project name="rauc/meta-rauc" remote="github" revision="2c07f828924c6e522925544ec51900935be23703" path="meta-rauc" />
 	<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
-	<project name="meta-arm" remote="yocto" revision="af928569b421431347c84f5941cee7aaa9f0ac74" path="meta-arm" />
-	<project name="jiazhang0/meta-secure-core" remote="github" revision="2ccf4aa4e352a1b990d0f59bf28de8639ca529d9" path="meta-secure-core" />
+	<project name="meta-arm" remote="yocto" revision="db6e0ed624f6e1eda9c3a0ed5f13057c24037f86" path="meta-arm" />
+	<project name="meta-java" remote="yocto" revision="1a8059f6b257ebe6fcae6416e499784d976afd24" path="meta-java" />
+	<project name="jiazhang0/meta-secure-core" remote="github" revision="d0a02859719f1a2c6b98d9d9afe785ec8535ec32" path="meta-secure-core" />
 
 	<!--
 		All entries above are pinned to a specific revision and updated manually.
@@ -55,6 +56,7 @@ SPDX-FileCopyrightText: Huawei Inc.
 	</project>
 	<project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" />
 	<project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" />
+	<project name="oniro-core/meta-openharmony.git" remote="eclipse" revision="kirkstone" path="meta-openharmony" />
 	<project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" />
 	<project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" />
 </manifest>

meta-oniro-core/recipes-core/images/oniro-image-base-tests.bb

@@ -13,11 +13,9 @@ IMAGE_INSTALL:append = "\
     kernel-selftest \
 "
 
-# This adds ptest packages to the image
-EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"
+# This adds ptest packages to the image, and enables empty root password
+EXTRA_IMAGE_FEATURES:append = " ptest-pkgs debug-tweaks"
 
 # For testing purposes, we want to have an extra ext4 format for the root
 # filesystem.
 IMAGE_FSTYPES:append = " ext4"
-
-ROOT_PARTITION_SIZE = "2500M"

meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb

@@ -11,9 +11,12 @@ IMAGE_INSTALL:append = "\
     packagegroup-oniro-tests \
 "
 
-# This adds ptest packages to the image
-EXTRA_IMAGE_FEATURES:append = " ptest-pkgs"
+# This adds ptest packages to the image, and enables empty root password
+EXTRA_IMAGE_FEATURES:append = " ptest-pkgs debug-tweaks"
 
 # For testing purposes, we want to have an extra ext4 format for the root
 # filesystem.
 IMAGE_FSTYPES:append = " ext4"
+
+# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
+PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh "

meta-oniro-core/recipes-kernel/linux/linux/fix-gcc-plugins-with-gcc-11.patch.license

 # SPDX-FileCopyrightText: Huawei Inc.
 #
-# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: GPL-2.0-only

meta-oniro-staging/classes/gn_base.bbclass

@@ -4,7 +4,9 @@
 
 # This class allows building GN-based projects.
 
-DEPENDS += "gn-native ninja-native"
+DEPENDS += "gn-native"
+
+inherit ninja
 
 # General GN options, like --dotfile
 GN_OPTIONS ??= ""