diff --git a/docs/oniro-quick-build.rst b/docs/oniro-quick-build.rst
index bff2013f9b2ecf595ce260f7173ece6ac478432d..84cfaee8879511506b06dcee482beb572bf15526 100644
--- a/docs/oniro-quick-build.rst
+++ b/docs/oniro-quick-build.rst
@@ -101,42 +101,6 @@ script wrapper as follows:
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.
-.. _Building with OpenHarmony:
-
-B. Building with OpenHarmony compatibility
-------------------------------------------
-
-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
-
- 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.
-
-As the build directory is now initialized, you can proceed to run the build
-process (instead of `qemuarm-efi`, you can also build for any of the supported
-targets - just make sure you set `MACHINE` to the same value while running
-`bitbake` and `runqemu`):
-
-.. code-block:: console
-
- $ MACHINE=qemuarm-efi bitbake oniro-image-base
-
-Once the image is built, you can run a Qemu instance using the provided
-script wrapper as follows:
-
-.. code-block:: console
-
- $ MACHINE=qemuarm-efi runqemu oniro-image-base serialstdio nographic slirp wic
-
Runtime Login
*************
diff --git a/docs/yocto-build-system/oniro-build-arch.rst b/docs/yocto-build-system/oniro-build-arch.rst
index 6632c18cb54ce22484d00f28bcba5ee9210292f8..ebd2faaaf1065f9fc1260eae06f6c28f2bfbb57b 100644
--- a/docs/yocto-build-system/oniro-build-arch.rst
+++ b/docs/yocto-build-system/oniro-build-arch.rst
@@ -7,20 +7,6 @@
|main_project_name| Build Architecture
######################################
-Oniro build architecture is composed of multifaceted, independent, modular, and
-reusable building blocks. In order to build OpenHarmony based images and its
-components, meta-openharmony component serves as one of the major building blocks.
-In context of OpenHarmony, the OS essentially builds upon various components and
-respective functionalities, and in terms of functionality, the meta-openharmony
-component principally helps to desolate the barrier of hardware boundaries, thus
-inevitably transcending the classical OS dichotomy.
-
-Architecturally, the `meta-openharmony` is a bitbake layer that contains recipes
-for building OpenHarmony images and components. The meta-openharmony includes a
-number of different repo manifest files, which you can use to fetch all repositories
-needed for building OpenHarmony. To have a successful build image, ensure that the
-undelying dependencies and the build procedure is followed in chronological order.
-
``Oniro Project`` architecture is documented using `c4 model <https://c4model.com/>`_.
.. contents::
diff --git a/flavours/linux/bblayers.conf.sample b/flavours/linux/bblayers.conf.sample
index 4cdb9e292e73d75a6f693acddec0611ddf1e774b..75c288e16eabc343760eccd50fae2e692b42664c 100644
--- a/flavours/linux/bblayers.conf.sample
+++ b/flavours/linux/bblayers.conf.sample
@@ -24,7 +24,6 @@ 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 \
@@ -40,7 +39,6 @@ BBLAYERS ?= " \
##OEROOT##/../meta-security/meta-tpm \
##OEROOT##/../meta-riscv \
##OEROOT##/../meta-rauc \
- ##OEROOT##/../meta-java \
##OEROOT##/../meta-seco-rockchip \
##OEROOT##/../meta-virtualization \
##OEROOT##/../meta-ts/meta-trustedsubstrate \
diff --git a/manifests/default.xml b/manifests/default.xml
index 848f99ea79e584f3d69da6fc2cd1dcf4e52c22af..6f3afe9fc4cc14b811e958d42e86628645df129d 100644
--- a/manifests/default.xml
+++ b/manifests/default.xml
@@ -39,7 +39,6 @@ SPDX-FileCopyrightText: Huawei Inc.
<project name="rauc/meta-rauc" remote="github" revision="ea4236412dc4449eff4d52d3ef6b6d230355f936" path="meta-rauc" />
<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
<project name="meta-arm" remote="yocto" revision="78fce73c3803aba82149a3a03fde1b708f5424fa" path="meta-arm" />
- <project name="meta-java" remote="yocto" revision="1a8059f6b257ebe6fcae6416e499784d976afd24" path="meta-java" />
<project name="jiazhang0/meta-secure-core" remote="github" revision="1a74be5b363ee61256093e0a3efaa78fd370a27c" path="meta-secure-core" />
<project name="pub/rockchip/meta-seco-rockchip" remote="seco" revision="e23ef0581b26636351e3194edb8ec65cca830542" path="meta-seco-rockchip" />
<project name="meta-virtualization" remote="yocto" revision="e11d5b630e6b5626b58b742b80f5bdf277a44168" path="meta-virtualization" />
@@ -60,7 +59,6 @@ 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/third-party/forks/meta-ledge-secure.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ledge-secure" />
<project name="oniro-core/third-party/forks/meta-ts.git" remote="eclipse" revision="oniro/kirkstone" path="meta-ts" />
<project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" />
diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index dd5200c5d3ddbd471841d2d8c09d08b910c9905e..4b84c7a3417fc3d45599a3dc0407b74282b2d146 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/meta-oniro-core/conf/distro/include/oniro.inc
@@ -10,10 +10,6 @@ require conf/distro/include/security_flags.inc
INHERIT += "oniro-sanity"
-# Configuration needed for meta-java layer
-PREFERRED_PROVIDER_virtual/java-initial-native ?= "cacao-initial-native"
-PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native"
-
BB_DANGLINGAPPENDS_WARNONLY:forcevariable = "0"
# Bump this each time bblayers.conf.sample changes incompatibly. For example,
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index dd295e7f8b9912145f871245b721a5df3464a4ac..b2f2525210c09191d2810292a296e9be4fc93448 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -106,12 +106,6 @@ GPU_MEM:raspberrypi-armv7 = "128"
SPLASH = "psplash-oniro"
-DISTRO_FEATURES_FILTER_NATIVE:append = " openharmony"
-DISTRO_FEATURES_FILTER_NATIVESDK:append = " openharmony"
-require conf/distro/include/openharmony.inc
-# OpenHarmony requires musl libc, so we cannot allow other TCLIBC values
-TCLIBC:df-openharmony = "musl"
-
# We run a read-only rootfs but we want shadow because it includes subid
# configuration used by podman in rootless mode.
ROOTFS_RO_UNNEEDED:remove = "shadow"
diff --git a/meta-oniro-core/recipes-bsp/hi3861/hi3861.bb b/meta-oniro-core/recipes-bsp/hi3861/hi3861.bb
deleted file mode 100644
index 3e768a4aacecb4a141aa4376bdfca9bc30dffe21..0000000000000000000000000000000000000000
--- a/meta-oniro-core/recipes-bsp/hi3861/hi3861.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# BIG FAT WARNING
-# This recipe is plain old WRONG
-# It's just there as a workaround to get things
-# building with a properly built toolchain.
-# THIS NEEDS TO GO AWAY
-
-SRC_URI += " \
- git://gitee.com/openharmony/device_hisilicon_hispark_pegasus.git;protocol=http \
- file://pegasus-make-wifiiot.patch \
-"
-
-SRCREV = "0af23969365dad92c0b080f28caada4102a9a7da"
-LICENSE = "MulanPSL-2.0"
-LIC_FILES_CHKSUM = "file://NOTICE;md5=d8d6d3af7fa6ad0de5ba69a3520963f8"
-S="${WORKDIR}/git"
-DEPENDS = "libgcc"
-# No clang support until the build system is fixed
-TOOLCHAIN = "gcc"
-
-inherit siteinfo
-inherit siteconfig
-
-do_compile () {
- # Use the correct toolchain
- TRIPLET=$(echo ${TARGET_PREFIX} |sed -e 's,-$,,')
- if [ "$TRIPLET" != "riscv32-unknown-elf" ]; then
- sed -i -e "s,riscv32-unknown-elf,$TRIPLET,g" sdk_liteos/build/make_scripts/usr.mk sdk_liteos/build/scripts/scons_env_cfg.py sdk_liteos/build/scripts/scons_utils.py sdk_liteos/config.gni sdk_liteos/factory.mk sdk_liteos/non_factory.mk
- fi
-
- # Passing -nostartfiles to ld is broken (and no longer accepted by current
- # toolchains). -nostartfiles goes to cc, not ld.
- sed -i -e 's, -nostartfiles,,' sdk_liteos/boot/loaderboot/module_config.mk sdk_liteos/boot/flashboot/module_config.mk sdk_liteos/build/make_scripts/config.mk
- sed -i -e 's|, "-nostartfiles"||' sdk_liteos/boot/loaderboot/SConscript sdk_liteos/boot/flashboot/SConscript
- sed -i -e 's|'-nostartfiles', ||' sdk_liteos/build/scripts/common_env.py
-
- # Locate libgcc correctly
- GCCVER="$(${TARGET_PREFIX}gcc --version |head -n1 |cut -d' ' -f3)"
- sed -i -e "s,7\.3\.0,${GCCVER}," sdk_liteos/build/make_scripts/usr.mk sdk_liteos/build/scripts/scons_env_cfg.py
- LIBGCC_PATH="${RECIPE_SYSROOT}/usr/lib/${TRIPLET}/${GCCVER}"
- sed -i -e "s|-lgcc|-L${LIBGCC_PATH} -lgcc|" sdk_liteos/build/make_scripts/config.mk
-
- cd sdk_liteos
- make all
-}
diff --git a/meta-oniro-core/recipes-bsp/hi3861/hi3861/pegasus-make-wifiiot.patch b/meta-oniro-core/recipes-bsp/hi3861/hi3861/pegasus-make-wifiiot.patch
deleted file mode 100644
index 56973673a7e98be357971aec58d0427f6963b7fc..0000000000000000000000000000000000000000
--- a/meta-oniro-core/recipes-bsp/hi3861/hi3861/pegasus-make-wifiiot.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/sdk_liteos/app/wifiiot_app/module_config.mk b/sdk_liteos/app/wifiiot_app/module_config.mk
-index 5c9baf2ae932a1de94983eb1a7a8193ff246a76d..97722001dd8888a97afb23ca5a278223111ac118 100755
---- a/sdk_liteos/app/wifiiot_app/module_config.mk
-+++ b/sdk_liteos/app/wifiiot_app/module_config.mk
-@@ -1,5 +1,5 @@
--ALL_LIBS := demo
--demo_srcs := init src
-+ALL_LIBS := wifiiot_app
-+wifiiot_app_srcs := init src
- CCFLAGS +=
- CCFLAGS += -D_PRE_WLAN_FEATURE_CSI -D_PRE_WLAN_FEATURE_P2P -DLWIP_ENABLE_DIAG_CMD=0
--CCFLAGS += -I$(MAIN_TOPDIR)/components/iperf2/include -I$(MAIN_TOPDIR)/app/demo/include -I$(MAIN_TOPDIR)/app/demo/init -I$(MAIN_TOPDIR)/app/demo/src -I$(MAIN_TOPDIR)/config/app -I$(MAIN_TOPDIR)/config/diag -I$(MAIN_TOPDIR)/platform/os/Huawei_LiteOS/net/ripple/exports -I$(MAIN_TOPDIR)/components/ripple/exports
-+CCFLAGS += -I$(MAIN_TOPDIR)/components/iperf2/include -I$(MAIN_TOPDIR)/app/wifiiot_app/include -I$(MAIN_TOPDIR)/app/wifiiot_app/init -I$(MAIN_TOPDIR)/app/wifiiot_app/src -I$(MAIN_TOPDIR)/config/app -I$(MAIN_TOPDIR)/config/diag -I$(MAIN_TOPDIR)/platform/os/Huawei_LiteOS/net/ripple/exports -I$(MAIN_TOPDIR)/components/ripple/exports -I$(MAIN_TOPDIR)/components/hilink/include
-diff --git a/sdk_liteos/build/make_scripts/usr.mk b/sdk_liteos/build/make_scripts/usr.mk
-index fe1d96829acbf1c1db2ac40603d31ad74cef1c55..c31c74e4dc878ce25ddca9ad9add84ae0d21dd5f 100755
---- a/sdk_liteos/build/make_scripts/usr.mk
-+++ b/sdk_liteos/build/make_scripts/usr.mk
-@@ -2,7 +2,7 @@ include $(MAIN_TOPDIR)/build/config/usr_config.mk
-
- COMPILE_MODULE :=
- USR_APP_ON ?= n
--APP_NAME ?= demo
-+APP_NAME ?= wifiiot_app
- Q := @
- TOOLS_PREFIX := riscv32-unknown-elf-
- GCC_VER_NUM := 7.3.0
diff --git a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb
index 1abf90a692cb5995967a23cf35ba438f24a047d1..8bb185d1a14d2c69623996be55fef2fa52c655c9 100644
--- a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb
+++ b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts.bb
@@ -19,9 +19,6 @@ SRC_URI = " \
file://run-mount-sysdata.mount \
file://oniro-homes.conf.tmpfiles \
"
-SRC_URI:df-openharmony += " \
- file://data.mount \
- "
REQUIRED_DISTRO_FEATURES ?= "systemd"
@@ -34,9 +31,6 @@ SYSTEMD_SERVICE:${PN} = " \
run-mount-devdata.mount \
run-mount-appdata.mount \
"
-SYSTEMD_SERVICE:${PN}:df-openharmony += " \
- data.mount \
- "
SYSTEMD_AUTO_ENABLE = "enable"
LABELS = " \
@@ -56,8 +50,5 @@ do_install () {
install -D "${WORKDIR}/oniro-homes.conf.tmpfiles" \
"${D}${sysconfdir}/tmpfiles.d/oniro-homes.conf"
}
-do_install:append:df-openharmony () {
- install -m 0644 "${WORKDIR}/data.mount" "${D}${systemd_unitdir}/system"
-}
FILES:${PN} += "${systemd_unitdir}"
diff --git a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/data.mount b/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/data.mount
deleted file mode 100644
index 7c3c5c2c050c2f14b1cb8c27c5583948f0f00dea..0000000000000000000000000000000000000000
--- a/meta-oniro-core/recipes-core/oniro-mounts/oniro-mounts/data.mount
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-[Unit]
-Description=data mount - openharmony
-Before=sysinit.target
-Requires=run-mount-appdata.mount
-After=run-mount-appdata.mount
-
-[Mount]
-What=/run/mount/appdata/openharmony
-Where=/data
-Options=bind
-
-[Install]
-WantedBy=sysinit.target
diff --git a/meta-oniro-staging/recipes-core/classpath/classpath-features-check.inc b/meta-oniro-staging/recipes-core/classpath/classpath-features-check.inc
deleted file mode 100644
index c238fc3fb63a2140e3cad6c069f72beecf71a6fc..0000000000000000000000000000000000000000
--- a/meta-oniro-staging/recipes-core/classpath/classpath-features-check.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-inherit features_check
-REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-oniro-staging/recipes-core/classpath/classpath_0.99.bbappend b/meta-oniro-staging/recipes-core/classpath/classpath_0.99.bbappend
deleted file mode 100644
index 06e82becc5960d875dcf4efc577c5e0bf0ba79f8..0000000000000000000000000000000000000000
--- a/meta-oniro-staging/recipes-core/classpath/classpath_0.99.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-include classpath-features-check.inc
diff --git a/meta-oniro-staging/recipes-core/libmatthew/libmatthew_0.8.bbappend b/meta-oniro-staging/recipes-core/libmatthew/libmatthew_0.8.bbappend
deleted file mode 100644
index ddbf2d45fe0767b092c4665b8efa04776d385af3..0000000000000000000000000000000000000000
--- a/meta-oniro-staging/recipes-core/libmatthew/libmatthew_0.8.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-include recipes-core/classpath/classpath-features-check.inc
diff --git a/meta-oniro-staging/recipes-extended/dbus/dbus-java_2.7.bbappend b/meta-oniro-staging/recipes-extended/dbus/dbus-java_2.7.bbappend
deleted file mode 100644
index ddbf2d45fe0767b092c4665b8efa04776d385af3..0000000000000000000000000000000000000000
--- a/meta-oniro-staging/recipes-extended/dbus/dbus-java_2.7.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-include recipes-core/classpath/classpath-features-check.inc