diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 658bd4c5464393a1818d0f9339e74b71cc4a2c6d..27184d8508cc6e802b14eb9e555a77b5a19cb846 100644 --- a/.gitlab-ci.yml +++ b/.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" diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 5f65913e2cc6d8de426332221006fe230969f007..e0ca6d7cae0d7279e75be4cf17107d3e4f5b41c9 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -17,4 +17,5 @@ BBLAYERS ?= " \ ##OEROOT##/../meta-openembedded/meta-python \ ##OEROOT##/../meta-openharmony \ ##OEROOT##/../meta-java \ + ##OEROOT##/../meta-raspberrypi \ " diff --git a/manifests/branch.xml b/manifests/branch.xml index 3b8071d315bd5d99217967cad48140709b1ddd8e..04bf9e0ff774bf6b587f6294de57bba0272b6bac 100644 --- a/manifests/branch.xml +++ b/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> diff --git a/manifests/pin.xml b/manifests/pin.xml index a61fce4fbcc2ea9bd12b03480020189619e4be91..a34bc7e43986ef2936a241a31dad0ce89b9b044d 100644 --- a/manifests/pin.xml +++ b/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>