diff --git a/meta-ohos-core/classes/oniro-sanity.bbclass b/meta-ohos-core/classes/oniro-sanity.bbclass index 64a6f3837bb3e816e5f347922a45d93710d2c5b2..dd12cdfa58e76d9990ee1301b85bef3599679349 100644 --- a/meta-ohos-core/classes/oniro-sanity.bbclass +++ b/meta-ohos-core/classes/oniro-sanity.bbclass @@ -8,7 +8,6 @@ # <REPLACEMENT_COLLECTION> is not provided, the layer was removed without a # replacement. ONIRO_DEPRECATED_COLLECTIONS = " \ - meta-ohos-demo:meta-ohos-blueprints \ " # Same format as for ONIRO_DEPRECATED_COLLECTIONS but for DISTRO configurations. diff --git a/meta-ohos-demo/conf/layer.conf b/meta-ohos-demo/conf/layer.conf deleted file mode 100644 index 450831092da327cf85b435354058a43c08362a2b..0000000000000000000000000000000000000000 --- a/meta-ohos-demo/conf/layer.conf +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - -# This layer was deprecated in favour of meta-ohos-blueprints. This is a -# compatible layer to not break existing bblayers.conf. -BBPATH .= ":${LAYERDIR}/../meta-ohos-blueprints" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/../meta-ohos-blueprints/recipes-*/*/*.bb \ - ${LAYERDIR}/../meta-ohos-blueprints/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "meta-ohos-demo" -BBFILE_PATTERN_meta-ohos-demo = "^${LAYERDIR}/../meta-ohos-blueprints" -BBFILE_PRIORITY_meta-ohos-demo = "6" - -LAYERDEPENDS_meta-ohos-demo = "core" -LAYERSERIES_COMPAT_meta-ohos-demo = "dunfell"