From 4051bbac93fe0862eb0106d46519a25887cba15e Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 18 Mar 2021 10:58:53 +0800 Subject: [PATCH] Add layer meta-stx-oran and distro poky-stx-oran meta-stx will be replaced by meta-stx-oran after changing to use meta-starlingx as the base layer, and only oran specific contents like distro and release info, fixes for issue only happened in oran, and etc. And add distro 'poky-stx-oran' so that we can have different disto configs for ORAN specific. Issue-ID: INF-213 Signed-off-by: Jackie Huang Change-Id: I3d8c609d99b3516b7a75f21e44327f1236eeddc5 --- meta-stx-oran/LICENSE | 209 +++++++++++++++++++++ meta-stx-oran/conf/distro/poky-stx-oran.conf | 20 ++ meta-stx-oran/conf/layer.conf | 59 ++++++ .../iso-codes/iso-codes_%.bbappend | 19 ++ .../recipes-core/base-files/base-files_%.bbappend | 28 +++ .../recipes-kernel/linux/kernel-devsrc.bb | 104 ++++++++++ scripts/build_inf.sh | 6 +- scripts/configs/local-anaconda.conf | 12 +- scripts/configs/local-stx.conf | 2 +- 9 files changed, 456 insertions(+), 3 deletions(-) create mode 100644 meta-stx-oran/LICENSE create mode 100644 meta-stx-oran/conf/distro/poky-stx-oran.conf create mode 100644 meta-stx-oran/conf/layer.conf create mode 100644 meta-stx-oran/recipes-anaconda/iso-codes/iso-codes_%.bbappend create mode 100644 meta-stx-oran/recipes-core/base-files/base-files_%.bbappend create mode 100644 meta-stx-oran/recipes-kernel/linux/kernel-devsrc.bb diff --git a/meta-stx-oran/LICENSE b/meta-stx-oran/LICENSE new file mode 100644 index 0000000..cf6e18f --- /dev/null +++ b/meta-stx-oran/LICENSE @@ -0,0 +1,209 @@ +Copyright (C) 2021 Wind River Systems, Inc. + +Source code included in the tree for individual recipes is under the LICENSE +stated in the associated recipe (.bb file) unless otherwise stated. + +The metadata is under the following license unless otherwise stated. + + + 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-stx-oran/conf/distro/poky-stx-oran.conf b/meta-stx-oran/conf/distro/poky-stx-oran.conf new file mode 100644 index 0000000..79fed24 --- /dev/null +++ b/meta-stx-oran/conf/distro/poky-stx-oran.conf @@ -0,0 +1,20 @@ +# +## Copyright (C) 2021 Wind River Systems, Inc. +# +# 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. + +require conf/distro/poky-stx.conf + +MAINTAINER = "Jackie Huang " + +ORAN_REL = "Dawn (4.0)" diff --git a/meta-stx-oran/conf/layer.conf b/meta-stx-oran/conf/layer.conf new file mode 100644 index 0000000..8c4dcc7 --- /dev/null +++ b/meta-stx-oran/conf/layer.conf @@ -0,0 +1,59 @@ +# +## Copyright (C) 2021 Wind River Systems, Inc. +# +# 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. + +# 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 += "stx-oran-layer" +BBFILE_PATTERN_stx-oran-layer := "^${LAYERDIR}/" +BBFILE_PRIORITY_stx-oran-layer = "5" + +LAYERDEPENDS_STX = "\ + core \ + dpdk \ + networking-layer \ + openembedded-layer \ + networking-layer \ + filesystems-layer \ + perl-layer \ + meta-python \ + webserver \ + virtualization-layer \ + cloud-services-layer \ + openstack-layer \ + stx-distro-layer \ +" + +LAYERDEPENDS_STX_ANACONDA = "\ + core \ + filesystems-layer \ + meta-python \ + networking-layer \ + openembedded-layer \ + stx-distro-layer \ +" + +LAYERDEPENDS_stx-oran-layer = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-anaconda', '${LAYERDEPENDS_STX_ANACONDA}', '${LAYERDEPENDS_STX}', d)}" + +# This should only be incremented on significant changes that will +# cause compatibility issues with other layers +LAYERVERSION_stx-oran-version = "1" +LAYERSERIES_COMPAT_stx-oran-layer = "thud warrior" + +LAYER_PATH_meta-stx-oran = "${LAYERDIR}" diff --git a/meta-stx-oran/recipes-anaconda/iso-codes/iso-codes_%.bbappend b/meta-stx-oran/recipes-anaconda/iso-codes/iso-codes_%.bbappend new file mode 100644 index 0000000..78cee8b --- /dev/null +++ b/meta-stx-oran/recipes-anaconda/iso-codes/iso-codes_%.bbappend @@ -0,0 +1,19 @@ +# +# Copyright (C) 2019-2021 Wind River Systems, Inc. +# +# 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. + +BRANCH = "main" +PROTOCOL = "https" + +SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=${PROTOCOL};branch=${BRANCH}" diff --git a/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend b/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend new file mode 100644 index 0000000..53b5a08 --- /dev/null +++ b/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend @@ -0,0 +1,28 @@ +# +## Copyright (C) 2021 Wind River Systems, Inc. +# +# 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. + +SUBPATH1 = "centos-release-config" +DSTSUFX1 = "stx-release-config" + +SRC_URI += " \ + git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX1};branch="r/stx.3.0";subpath=${SUBPATH1};name=opendev \ + " + +do_install_append() { + install -m 644 ${WORKDIR}/${DSTSUFX1}/files/issue ${D}/${sysconfdir}/issue + install -m 644 ${WORKDIR}/${DSTSUFX1}/files/issue.net ${D}/${sysconfdir}/issue.net + + sed -i -e 's/@PLATFORM_RELEASE@/${ORAN_REL}/' ${D}${sysconfdir}/issue* +} diff --git a/meta-stx-oran/recipes-kernel/linux/kernel-devsrc.bb b/meta-stx-oran/recipes-kernel/linux/kernel-devsrc.bb new file mode 100644 index 0000000..a9e3e6c --- /dev/null +++ b/meta-stx-oran/recipes-kernel/linux/kernel-devsrc.bb @@ -0,0 +1,104 @@ +# +# Copyright (C) 2019-2021 Wind River Systems, Inc. +# +# 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. + +SUMMARY = "Linux kernel Development Source" +DESCRIPTION = "Development source linux kernel. When built, this recipe packages the \ +source of the preferred virtual/kernel provider and makes it available for full kernel \ +development or external module builds" + +SECTION = "kernel" + +LICENSE = "GPLv2" + +inherit linux-kernel-base + +# Whilst not a module, this ensures we don't get multilib extended (which would make no sense) +inherit module-base + +# We need the kernel to be staged (unpacked, patched and configured) before +# we can grab the source and make the source package. We also need the bits from +# ${B} not to change while we install, so virtual/kernel must finish do_compile. +do_install[depends] += "virtual/kernel:do_shared_workdir" +# Need the source, not just the output of populate_sysroot +do_install[depends] += "virtual/kernel:do_install" + +# There's nothing to do here, except install the source where we can package it +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_patch[noexec] = "1" +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_populate_sysroot[noexec] = "1" + +S = "${STAGING_KERNEL_DIR}" +B = "${STAGING_KERNEL_BUILDDIR}" + +KERNEL_VERSION = "${@get_kernelversion_headers('${S}')}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + kerneldir=${D}${KERNEL_SRC_PATH} + install -d $kerneldir + + # + # Copy the staging dir source (and module build support) into the devsrc structure. + # We can keep this copy simple and take everything, since a we'll clean up any build + # artifacts afterwards, and the extra i/o is not significant + # + cd ${B} + find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir + cd ${S} + find . -type d -name '.git*' -prune -o -type d -name '.kernel-meta' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir + + # Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not + # The main build artifacts. We clean the directory to avoid QA errors on mismatched + # architecture (since scripts and helpers are native format). + KBUILD_OUTPUT="$kerneldir" + oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts + + # make clean generates an absolute path symlink called "source" + # in $kerneldir points to $kerneldir, which doesn't make any + # sense, so remove it. + if [ -L $kerneldir/source ]; then + bbnote "Removing $kerneldir/source symlink" + rm -f $kerneldir/source + fi + + # As of Linux kernel version 3.0.1, the clean target removes + # arch/powerpc/lib/crtsavres.o which is present in + # KBUILD_LDFLAGS_MODULE, making it required to build external modules. + if [ ${ARCH} = "powerpc" ]; then + mkdir -p $kerneldir/arch/powerpc/lib/ + cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o + fi + + # Remove fixdep/objtool as they won't be target binaries + for i in fixdep objtool; do + if [ -e $kerneldir/tools/objtool/$i ]; then + rm -rf $kerneldir/tools/objtool/$i + fi + done + + chown -R root:root ${D} +} +# Ensure we don't race against "make scripts" during cpio +do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" + +PACKAGES = "kernel-devsrc" +FILES_${PN} = "${KERNEL_SRC_PATH}" +RDEPENDS_${PN} = "bc" + +INSANE_SKIP_${PN} = "arch" diff --git a/scripts/build_inf.sh b/scripts/build_inf.sh index 6f78684..7ae268e 100755 --- a/scripts/build_inf.sh +++ b/scripts/build_inf.sh @@ -293,8 +293,9 @@ prepare_src () { echo_info "Use the cloned oran repo: ${CLONED_ORAN_REPO}" mkdir -p ${SRC_ORAN_DIR}/rtp cd ${SRC_ORAN_DIR}/rtp - rm -rf scripts + rm -rf meta-stx-oran scripts ln -sf ${CLONED_ORAN_REPO}/scripts scripts + ln -sf ${CLONED_ORAN_REPO}/meta-stx-oran meta-stx-oran else echo_info "Cloning oran layer:" cd ${SRC_ORAN_DIR} @@ -370,6 +371,8 @@ add_layer_stx_build () { esac done + SRC_LAYERS="${SRC_LAYERS} ${SRC_ORAN_DIR}/rtp/meta-stx-oran" + for src_layer in ${SRC_LAYERS}; do RUN_CMD="bitbake-layers add-layer ${src_layer}" @@ -450,6 +453,7 @@ add_layer_anaconda_build () { SRC_LAYERS="${SRC_LAYERS} ${SRC_LAYER_DIR}/meta-anaconda" SRC_LAYERS="${SRC_LAYERS} ${SRC_STX_DIR}/meta-stx-distro" SRC_LAYERS="${SRC_LAYERS} ${SRC_STX_DIR}/meta-stx-integ" + SRC_LAYERS="${SRC_LAYERS} ${SRC_ORAN_DIR}/rtp/meta-stx-oran" for src_layer in ${SRC_LAYERS}; do RUN_CMD="bitbake-layers add-layer ${src_layer}" diff --git a/scripts/configs/local-anaconda.conf b/scripts/configs/local-anaconda.conf index 4a49c84..25ba760 100644 --- a/scripts/configs/local-anaconda.conf +++ b/scripts/configs/local-anaconda.conf @@ -14,8 +14,18 @@ IMAGE_OVERHEAD_FACTOR = "1.05" BBMASK += " \ /meta-stx-distro/recipes-core/images/stx-image-aio.bb \ /meta-stx-distro/recipes-httpd \ + /meta-stx-integ/recipes-bsp \ + /meta-stx-integ/recipes-connectivity \ + /meta-stx-integ/recipes-core/base-files \ + /meta-stx-integ/recipes-core/init* \ + /meta-stx-integ/recipes-core/systemd \ + /meta-stx-integ/recipes-daemons \ + /meta-stx-integ/recipes-dbs \ /meta-stx-integ/recipes-devtools \ - /meta-stx-integ/recipes-graphics \ /meta-stx-integ/recipes-extended \ + /meta-stx-integ/recipes-graphics \ + /meta-stx-integ/recipes-networking \ /meta-stx-integ/recipes-security \ + /meta-stx-integ/recipes-support \ + /meta-stx-oran/recipes-core \ " diff --git a/scripts/configs/local-stx.conf b/scripts/configs/local-stx.conf index 0e6a3d6..ef61cf3 100644 --- a/scripts/configs/local-stx.conf +++ b/scripts/configs/local-stx.conf @@ -2,7 +2,7 @@ # Configs for StarlingX # ######################### -DISTRO = "poky-stx" +DISTRO = "poky-stx-oran" MACHINE = "@BSP@" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt" -- 2.16.6