From d94c6b3b4cacf6f5e1fbc9a78732d635c848106a Mon Sep 17 00:00:00 2001
From: Robert Drab <robert.drab@huawei.com>
Date: Wed, 30 Dec 2020 16:28:42 +0100
Subject: [PATCH] Merging meta-ohos-common into meta-ohos-foundation
Two REDAME.md merged into one; all recipes gatherd inside
meta-ohos-foundation subirectory
Signed-off-by: Robert Drab <robert.drab@huawei.com>
---
README.md | 35 ----
conf/layer.conf | 13 --
meta-ohos-foundation/LICENSES/Apache-2.0.txt | 183 ------------------
meta-ohos-foundation/README.md | 17 +-
.../hiviewdfx-hilog/hiviewdfx-hilog_git.bb | 0
...rily-adding-sysparam-HAL-definitions.patch | 0
.../syspara-lite-framework_git.bb | 0
.../hiviewdfx-innerkits-hilog_git.bb | 0
.../syspara-lite-hals-headers_git.bb | 0
.../syspara-lite-headers_git.bb | 0
.../utils-native-lite_git.bb | 0
11 files changed, 5 insertions(+), 243 deletions(-)
delete mode 100644 README.md
delete mode 100644 conf/layer.conf
delete mode 100644 meta-ohos-foundation/LICENSES/Apache-2.0.txt
rename {recipes-frameworks => meta-ohos-foundation/recipes-frameworks}/hiviewdfx-hilog/hiviewdfx-hilog_git.bb (100%)
rename {recipes-frameworks => meta-ohos-foundation/recipes-frameworks}/syspara-lite-framework/syspara-lite-framework/0001-Temporarily-adding-sysparam-HAL-definitions.patch (100%)
rename {recipes-frameworks => meta-ohos-foundation/recipes-frameworks}/syspara-lite-framework/syspara-lite-framework_git.bb (100%)
rename {recipes-interfaces => meta-ohos-foundation/recipes-interfaces}/hiviewdfx-innerkits-hilog/hiviewdfx-innerkits-hilog_git.bb (100%)
rename {recipes-interfaces => meta-ohos-foundation/recipes-interfaces}/syspara-lite-hals-headers/syspara-lite-hals-headers_git.bb (100%)
rename {recipes-interfaces => meta-ohos-foundation/recipes-interfaces}/syspara-lite-headers/syspara-lite-headers_git.bb (100%)
rename {recipes-utils => meta-ohos-foundation/recipes-utils}/utils-native-lite/utils-native-lite_git.bb (100%)
diff --git a/README.md b/README.md
deleted file mode 100644
index baf9391e..00000000
--- a/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-meta-ohos-common
-================
-This README file contains information on the contents of the meta-ohos-common layer.
-
-Please see the corresponding sections below for details.
-
-Dependencies
-============
-
-This layer depends on:
-
- URI: git://git.yoctoproject.org/poky.git
- branch: master
-
- meta-ohos/meta-ohos-thirdparty
-
-Table of Contents
-=================
-
- I. Adding the meta-common layer to your build
- II. Misc
-
-I. Adding the meta-common layer to your build
-=================================================
-
-Run 'bitbake-layers add-layer meta-ohos-common'
-
-II. Misc
-========
-This layer provides commonly used OHOS libraries and headers.
-
-## Layer layout
- - recipes-frameworks - recipes for various OHOS frameworks libraries
- - recipes-interfaces - recipes providing OHOS interfaces headers
- - recipes-utils - recipes for various OHOS utilities
diff --git a/conf/layer.conf b/conf/layer.conf
deleted file mode 100644
index c671e859..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-common"
-BBFILE_PATTERN_ohos-common = "^${LAYERDIR}/"
-BBFILE_PRIORITY_ohos-common = "6"
-
-LAYERDEPENDS_ohos-common = "core ohos-thirdparty"
-LAYERSERIES_COMPAT_ohos-common = "gatesgarth"
diff --git a/meta-ohos-foundation/LICENSES/Apache-2.0.txt b/meta-ohos-foundation/LICENSES/Apache-2.0.txt
deleted file mode 100644
index 9a4104bb..00000000
--- a/meta-ohos-foundation/LICENSES/Apache-2.0.txt
+++ /dev/null
@@ -1,183 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution
-as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct
-or indirect, to cause the direction or management of such entity, whether
-by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
-of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
-granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled object
-code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that
-is included in or attached to the work (an example is provided in the Appendix
-below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative
-Works shall not include works that remain separable from, or merely link (or
-bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative
-Works thereof, that is intentionally submitted to Licensor for inclusion in
-the Work by the copyright owner or by an individual or Legal Entity authorized
-to submit on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication
-sent to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor
-for the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently incorporated
-within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, sublicense, and distribute
-the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License,
-each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section) patent
-license to make, have made, use, offer to sell, sell, import, and otherwise
-transfer the Work, where such license applies only to those patent claims
-licensable by such Contributor that are necessarily infringed by their Contribution(s)
-alone or by combination of their Contribution(s) with the Work to which such
-Contribution(s) was submitted. If You institute patent litigation against
-any entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that the Work or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses granted to You
-under this License for that Work shall terminate as of the date such litigation
-is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and
-in Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy
-of this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source
-form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable copy
-of the attribution notices contained within such NOTICE file, excluding those
-notices that do not pertain to any part of the Derivative Works, in at least
-one of the following places: within a NOTICE text file distributed as part
-of the Derivative Works; within the Source form or documentation, if provided
-along with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text from the
-Work, provided that such additional attribution notices cannot be construed
-as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction,
-or distribution of Your modifications, or for any such Derivative Works as
-a whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without
-any additional terms or conditions. Notwithstanding the above, nothing herein
-shall supersede or modify the terms of any separate license agreement you
-may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to
-in writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied, including, without limitation, any warranties
-or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
-A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness
-of using or redistributing the Work and assume any risks associated with Your
-exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether
-in tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to
-in writing, shall any Contributor be liable to You for damages, including
-any direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability
-to use the Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all other commercial
-damages or losses), even if such Contributor has been advised of the possibility
-of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work
-or Derivative Works thereof, You may choose to offer, and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such obligations,
-You may act only on Your own behalf and on Your sole responsibility, not on
-behalf of any other Contributor, and only if You agree to indemnify, defend,
-and hold each Contributor harmless for any liability incurred by, or claims
-asserted against, such Contributor by reason of your accepting any such warranty
-or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own identifying
-information. (Don't include the brackets!) The text should be enclosed in
-the appropriate comment syntax for the file format. We also recommend that
-a file or class name and description of purpose be included on the same "printed
-page" as the copyright notice for easier identification within third-party
-archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/meta-ohos-foundation/README.md b/meta-ohos-foundation/README.md
index ab0e94b5..c116bcb2 100644
--- a/meta-ohos-foundation/README.md
+++ b/meta-ohos-foundation/README.md
@@ -2,16 +2,6 @@ This README file contains information on the contents of the meta-ohos-foundatio
Please see the corresponding sections below for details.
-Dependencies
-============
-
- URI: https://git.ostc-eu.org/incubate/meta-ohos/meta-common.git
- branch: develop
-
- URI: https://git.ostc-eu.org/incubate/meta-ohos/meta-thirdparty.git
- branch: develop
-
-
Table of Contents
=================
@@ -22,7 +12,7 @@ Table of Contents
I. Adding the meta-foundation layer to your build
=================================================
-Run 'bitbake-layers add-layer meta-foundation'
+Run 'bitbake-layers add-layer meta-ohos-foundation'
II. Misc
========
@@ -33,4 +23,7 @@ the OHOS.
## Layer layout:
- recipes
- samgr - Distritbuted Services Manager
- - safwk - Main foundation application (initialization routines)
+ - safwk - Main foundation application (initialization routines)
+ - frameworks - various OHOS frameworks libraries
+ - interfaces - OHOS interfaces headers
+ - utils - various OHOS utilities
diff --git a/recipes-frameworks/hiviewdfx-hilog/hiviewdfx-hilog_git.bb b/meta-ohos-foundation/recipes-frameworks/hiviewdfx-hilog/hiviewdfx-hilog_git.bb
similarity index 100%
rename from recipes-frameworks/hiviewdfx-hilog/hiviewdfx-hilog_git.bb
rename to meta-ohos-foundation/recipes-frameworks/hiviewdfx-hilog/hiviewdfx-hilog_git.bb
diff --git a/recipes-frameworks/syspara-lite-framework/syspara-lite-framework/0001-Temporarily-adding-sysparam-HAL-definitions.patch b/meta-ohos-foundation/recipes-frameworks/syspara-lite-framework/syspara-lite-framework/0001-Temporarily-adding-sysparam-HAL-definitions.patch
similarity index 100%
rename from recipes-frameworks/syspara-lite-framework/syspara-lite-framework/0001-Temporarily-adding-sysparam-HAL-definitions.patch
rename to meta-ohos-foundation/recipes-frameworks/syspara-lite-framework/syspara-lite-framework/0001-Temporarily-adding-sysparam-HAL-definitions.patch
diff --git a/recipes-frameworks/syspara-lite-framework/syspara-lite-framework_git.bb b/meta-ohos-foundation/recipes-frameworks/syspara-lite-framework/syspara-lite-framework_git.bb
similarity index 100%
rename from recipes-frameworks/syspara-lite-framework/syspara-lite-framework_git.bb
rename to meta-ohos-foundation/recipes-frameworks/syspara-lite-framework/syspara-lite-framework_git.bb
diff --git a/recipes-interfaces/hiviewdfx-innerkits-hilog/hiviewdfx-innerkits-hilog_git.bb b/meta-ohos-foundation/recipes-interfaces/hiviewdfx-innerkits-hilog/hiviewdfx-innerkits-hilog_git.bb
similarity index 100%
rename from recipes-interfaces/hiviewdfx-innerkits-hilog/hiviewdfx-innerkits-hilog_git.bb
rename to meta-ohos-foundation/recipes-interfaces/hiviewdfx-innerkits-hilog/hiviewdfx-innerkits-hilog_git.bb
diff --git a/recipes-interfaces/syspara-lite-hals-headers/syspara-lite-hals-headers_git.bb b/meta-ohos-foundation/recipes-interfaces/syspara-lite-hals-headers/syspara-lite-hals-headers_git.bb
similarity index 100%
rename from recipes-interfaces/syspara-lite-hals-headers/syspara-lite-hals-headers_git.bb
rename to meta-ohos-foundation/recipes-interfaces/syspara-lite-hals-headers/syspara-lite-hals-headers_git.bb
diff --git a/recipes-interfaces/syspara-lite-headers/syspara-lite-headers_git.bb b/meta-ohos-foundation/recipes-interfaces/syspara-lite-headers/syspara-lite-headers_git.bb
similarity index 100%
rename from recipes-interfaces/syspara-lite-headers/syspara-lite-headers_git.bb
rename to meta-ohos-foundation/recipes-interfaces/syspara-lite-headers/syspara-lite-headers_git.bb
diff --git a/recipes-utils/utils-native-lite/utils-native-lite_git.bb b/meta-ohos-foundation/recipes-utils/utils-native-lite/utils-native-lite_git.bb
similarity index 100%
rename from recipes-utils/utils-native-lite/utils-native-lite_git.bb
rename to meta-ohos-foundation/recipes-utils/utils-native-lite/utils-native-lite_git.bb
--
GitLab