From d3f2c206ba3e629b8d957aa1dae8f8d2e381cbd7 Mon Sep 17 00:00:00 2001
From: Robert Drab <robert.drab@huawei.com>
Date: Wed, 30 Dec 2020 16:39:15 +0100
Subject: [PATCH] Merging meta-thirdparty into meta-ohos-foundation
Two REDAME.md merged into one; all thirdparty recipes gatherd
inside meta-ohos-foundation subirectory
Signed-off-by: Robert Drab <robert.drab@huawei.com>
---
README.md | 36 -------------------
conf/layer.conf | 13 -------
meta-ohos-foundation/README.md | 5 ++-
.../recipes-libs}/cjson/cjson_1.7.14.bb | 0
.../recipes-libs}/libsec/libsec_git.bb | 0
5 files changed, 4 insertions(+), 50 deletions(-)
delete mode 100644 README.md
delete mode 100644 conf/layer.conf
rename {recipes-libs => meta-ohos-foundation/recipes-libs}/cjson/cjson_1.7.14.bb (100%)
rename {recipes-libs => meta-ohos-foundation/recipes-libs}/libsec/libsec_git.bb (100%)
diff --git a/README.md b/README.md
deleted file mode 100644
index 3989c0d6..00000000
--- a/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-meta-ohos-thirdparty
-====================
-
-This README file contains information on the contents of the meta-ohos-thirdparty layer.
-
-Please see the corresponding sections below for details.
-
-Dependencies
-============
-
-This layer depends on:
-
- URI: git://git.yoctoproject.org/poky.git
- branch: master
-
-Table of Contents
-=================
-
- I. Adding the meta-thirdparty layer to your build
- II. Misc
-
-
-I. Adding the meta-thirdparty layer to your build
-=================================================
-
-Run 'bitbake-layers add-layer meta-ohos/meta-ohos-thirdparty'
-
-II. Misc
-========
-This layer provides recipes for various third-party libraries
-used by OHOS.
-
-## Layer layout:
- - recipes-libs
- - cjson - Ultralightweight JSON parser in ANSI C
- - libsec - library implementing Annex K of C11, Bounds-checking interfaces
diff --git a/conf/layer.conf b/conf/layer.conf
deleted file mode 100644
index c8548f18..00000000
--- a/conf/layer.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "ohos-thirdparty"
-BBFILE_PATTERN_ohos-thirdparty = "^${LAYERDIR}/"
-BBFILE_PRIORITY_ohos-thirdparty = "6"
-
-LAYERDEPENDS_ohos-thirdparty = "core"
-LAYERSERIES_COMPAT_ohos-thirdparty = "gatesgarth"
diff --git a/meta-ohos-foundation/README.md b/meta-ohos-foundation/README.md
index c116bcb2..27f0097c 100644
--- a/meta-ohos-foundation/README.md
+++ b/meta-ohos-foundation/README.md
@@ -21,9 +21,12 @@ This layer provides recipes for the core elements (foundation) of
the OHOS.
## Layer layout:
- - recipes
+ - recipes
- samgr - Distritbuted Services Manager
- safwk - Main foundation application (initialization routines)
- frameworks - various OHOS frameworks libraries
- interfaces - OHOS interfaces headers
- utils - various OHOS utilities
+ - recipes-libs
+ - cjson - Ultralightweight JSON parser in ANSI C
+ - libsec - library implementing Annex K of C11, Bounds-checking interfaces
diff --git a/recipes-libs/cjson/cjson_1.7.14.bb b/meta-ohos-foundation/recipes-libs/cjson/cjson_1.7.14.bb
similarity index 100%
rename from recipes-libs/cjson/cjson_1.7.14.bb
rename to meta-ohos-foundation/recipes-libs/cjson/cjson_1.7.14.bb
diff --git a/recipes-libs/libsec/libsec_git.bb b/meta-ohos-foundation/recipes-libs/libsec/libsec_git.bb
similarity index 100%
rename from recipes-libs/libsec/libsec_git.bb
rename to meta-ohos-foundation/recipes-libs/libsec/libsec_git.bb
--
GitLab