From 12e8382853542dfea7cefb0c4975b705ffc173f0 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Fri, 15 Oct 2021 15:20:27 +0100
Subject: [PATCH] meta-ohos-demo: Remove obsolete layer
This was part of a deprecation process when the demo layer was renamed
to blueprints. We can remove it now as this was done a fair amount of
time ago.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-ohos-core/classes/oniro-sanity.bbclass | 1 -
meta-ohos-demo/conf/layer.conf | 18 ------------------
2 files changed, 19 deletions(-)
delete mode 100644 meta-ohos-demo/conf/layer.conf
diff --git a/meta-ohos-core/classes/oniro-sanity.bbclass b/meta-ohos-core/classes/oniro-sanity.bbclass
index 64a6f383..dd12cdfa 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 45083109..00000000
--- 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"
--
GitLab