Merge branch 'stefan/pi4-support' into 'kirkstone'

Adding Pi4 support for basic CI build

See merge request eclipse/oniro-core/meta-openharmony!105

.gitlab-ci.yml

@@ -240,7 +240,7 @@ fetch:
     - export DISTRO MACHINE
     - for DISTRO in oniro-openharmony-linux ; do
       for OPENHARMONY_VERSION in 3.0 ; do
-      for MACHINE in qemuarma7 ; do
+      for MACHINE in qemuarma7 raspberrypi4-64 ; do
         RECIPES="oniro-openharmony-bundle openharmony-standard-image openharmony-standard-image-tests" ;
         echo Fetching DISTRO=$DISTRO OPENHARMONY_VERSION=$OPENHARMONY_VERSION MACHINE=$MACHINE ;
         sed -r "s/^OPENHARMONY_VERSION.*/OPENHARMONY_VERSION = \"${OPENHARMONY_VERSION}\"/" -i conf/auto.conf ;
@@ -330,7 +330,7 @@ build:
     matrix:
       - DISTRO: [oniro-openharmony-linux]
         OPENHARMONY_VERSION: ["3.0"]
-        MACHINE: [qemuarma7]
+        MACHINE: [qemuarma7, raspberrypi4-64]
         RECIPE: [oniro-openharmony-toolchain, oniro-openharmony-bundle, openharmony-standard-image, openharmony-tools]
   artifacts:
     paths:
@@ -391,7 +391,7 @@ acts:
     - sudo ip link set tap0 up
     - bitbake qemu-helper-native
     - runqemu publicvnc serialstdio & sleep 130
-    - ./tmp-*/deploy/sdk/openharmony-tools-*.sh -y -d openharmony-tools
+    - ./tmp-*/deploy/sdk/openharmony-tools-${OPENHARMONY_VERSION}-cortexa7-neon-vfpv4-*.sh -y -d openharmony-tools
     - source ./openharmony-tools/environment-setup-$(uname -m)*
     - i=0 ; while [ "$i" -lt $HDC_CONNECT_ATTEMPTS ] ; do
         hdc_result="$(hdc tconn 192.168.7.2:35000)" ; echo "hdc:" "$hdc_result" ;
@@ -524,7 +524,7 @@ ohos:
   script:
     - tar xfz $TARBALL_FILE
     - cd $(basename $TARBALL_FILE .tar.gz)/OpenHarmony
-    - ../../build/tmp-*/deploy/sdk/${PREBUILT_IMAGE}-${OPENHARMONY_VERSION}-*.sh -y -d oniro
+    - ../../build/tmp-*/deploy/sdk/${PREBUILT_IMAGE}-${OPENHARMONY_VERSION}-cortexa7-neon-vfpv4-*.sh -y -d oniro
     - ./oniro/setup.sh
     - MAX_JOBS="${CI_ONIRO_PARALLEL_BUILD_MAX_JOBS:-$(nproc)}"
     - NINJA_ARGS="--ninja-args -j$MAX_JOBS"

conf/bblayers.conf.sample

@@ -17,4 +17,5 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-openembedded/meta-python \
   ##OEROOT##/../meta-openharmony \
   ##OEROOT##/../meta-java \
+  ##OEROOT##/../meta-raspberrypi \
   "

manifests/branch.xml

@@ -18,5 +18,6 @@ SPDX-FileCopyrightText: Huawei Inc.
   <project name="meta-openembedded" remote="openembedded" revision="master" />
   <project name="meta-clang" remote="kraj" />
   <project name="meta-java" remote="yocto" />
+  <project name="meta-raspberrypi" remote="yocto" />
   
 </manifest>

manifests/pin.xml

@@ -13,5 +13,6 @@ SPDX-FileCopyrightText: Huawei Inc.
   <extend-project name="meta-openembedded" revision="8f2dc1023482863e2630d1b94052c41ce748b38f" />
   <extend-project name="meta-clang" revision="d669d873edf68dc7440bb07096737203bb7ec505" />
   <extend-project name="meta-java" revision="1a8059f6b257ebe6fcae6416e499784d976afd24" />
+  <extend-project name="meta-raspberrypi" revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462" />
 
 </manifest>