meta-oran: remove obsoleted layer and related scripts
Remove the obsoleted meta-oran layer and related scripts, which
inchludes:
- meta-oran layer
- build_oran.sh script
- related info in docs like docs/developer-guide.rst and README.md
Issue-ID: INF-256
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Id66f0ab69c18d83feb69c93223d3e504422225ba
diff --git a/README.md b/README.md
index f769a6a..4d97ef3 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# o-ran repo for Performance Tuned Infrastructure
-This includes a Yocto/OpenEmbedded compatible layer meta-oran and wrapper scripts
+This includes a Yocto/OpenEmbedded compatible layer meta-stx-oran and wrapper scripts
to pull all required Yocto/OE layers to build out the reference platform.
-meta-oran layer depends on many Yocto/OE layers with 'thud' branch (Yocto version 2.6),to have a better user experience, meta-oran depends on WRLinux 1018 open source version and uses wrlinux setup tools to create the build environment.
+meta-stx-oran layer depends on many Yocto/OE layers with 'thud' branch (Yocto version 2.6),to have a better user experience, meta-stx-oran depends on WRLinux 1018 open source version and uses wrlinux setup tools to create the build environment.
## About Yocto and Wind River Linux
diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index 78a12cf..048ca3d 100755
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -12,7 +12,7 @@
This project implements a real time platform to deploy the O-CU and O-DU and it's based on Yocto/OpenEmbedded.
-This includes a Yocto/OpenEmbedded compatible layer meta-oran and wrapper scripts
+This includes a Yocto/OpenEmbedded compatible layer meta-stx-oran and wrapper scripts
to pull all required Yocto/OE layers to build out the reference platform.
To contribute on this project, basic knowledge of Yocto/OpenEmbedded is needed, please refer to the following docs if you want to learn about how to develop with Yocto/OpenEmbedded:
@@ -76,40 +76,3 @@
If all go well, you will get the ISO image in:
${WORKSPACE}/prj_oran_inf_anaconda/tmp-glibc/deploy/images/intel-corei7-64/inf-image-aio-installer-intel-corei7-64.iso
-3. (Optional, will be obsoleted in F release) Use wrapper script build_oran.sh to setup build env and build the lagecy x86 image
---------------------------------------------------------------------------------------------------------------------------------
-
-Note: The lagecy image is the Kubernetes Cluster image as the same one in Amber (1.0) release.
-
-::
-
- # Get the wrapper script with either curl or wget
- $ curl -o build_oran.sh 'https://gerrit.o-ran-sc.org/r/gitweb?p=pti/rtp.git;a=blob_plain;f=scripts/build_oran.sh;hb=HEAD'
- $ wget -O build_oran.sh 'https://gerrit.o-ran-sc.org/r/gitweb?p=pti/rtp.git;a=blob_plain;f=scripts/build_oran.sh;hb=HEAD'
-
- $ chmod +x build_oran.sh
- $ WORKSPACE=/path/to/workspace_lagecy
- $ ./build_oran.sh -w ${WORKSPACE}
-
-If all go well, you will get the ISO image in:
-${WORKSPACE}/prj_oran_inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso
-
-4. (Optional, will be obsoleted in F release) Use wrapper script build_oran.sh to setup build env and build the ARM Kubernetes Cluster image
---------------------------------------------------------------------------------------------------------------------------------------------
-
-Note:
- * the ARM Kubernetes Cluster image only supports the BSP nxp-lx2xxx and is verified with the board NXP LX2160ARDB
- * The ISO image is supported yet.
-
-::
-
- # Get the wrapper script with either curl or wget
- $ curl -o build_oran.sh 'https://gerrit.o-ran-sc.org/r/gitweb?p=pti/rtp.git;a=blob_plain;f=scripts/build_oran.sh;hb=HEAD'
- $ wget -O build_oran.sh 'https://gerrit.o-ran-sc.org/r/gitweb?p=pti/rtp.git;a=blob_plain;f=scripts/build_oran.sh;hb=HEAD'
-
- $ chmod +x build_oran.sh
- $ WORKSPACE=/path/to/workspace_arm
- $ ./build_oran.sh -w ${WORKSPACE} -b nxp-lx2xxx
-
-If all go well, you will get the rootfs image in:
-${WORKSPACE}/prj_oran_inf/tmp-glibc/deploy/images/nxp-lx2xxx/oran-image-inf-host-nxp-lx2xxx.tar.bz2
diff --git a/meta-oran/LICENSE b/meta-oran/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/meta-oran/LICENSE
+++ /dev/null
@@ -1,201 +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-oran/README b/meta-oran/README
deleted file mode 100644
index 3281dcd..0000000
--- a/meta-oran/README
+++ /dev/null
@@ -1,48 +0,0 @@
-meta-oran
-===============
-
-This layer provides the following common and platform-specific virtualization
-features:
-
-
-Dependencies
-------------
-This layer depends on the wrlinux layer.
-
-
-Maintenance
------------
-This layer is maintained by Wind River Systems, Inc.
-Contact <support@windriver.com> or your support representative for more
-information on submitting changes.
-
-
-Building the meta-oran layer
-==================================
-
-This layer should be added to the bblayers.conf file. To enable certain
-feature provided by this layer, add the feature to the local.conf file.
-
-The O-RAN functionality can be enable by setting DISTRO = "oran".
-
-
-License
--------
-Copyright (C) 2019 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.
-
-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-oran/classes/go112.bbclass b/meta-oran/classes/go112.bbclass
deleted file mode 100644
index f968f04..0000000
--- a/meta-oran/classes/go112.bbclass
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-do_compile_prepend() {
- unset GOCACHE
-}
diff --git a/meta-oran/conf/distro/include/oran-whitelist.conf b/meta-oran/conf/distro/include/oran-whitelist.conf
deleted file mode 100644
index f491a83..0000000
--- a/meta-oran/conf/distro/include/oran-whitelist.conf
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-#
-# Explicitly allow these recipes in O-RAN
-#
-
-# Whitelist for meta-cloud-services
-PNWHITELIST_cloud-services-layer_append = " \
- celt051 \
- glusterfs \
- librdmacm \
- libibverbs \
-"
-
-# Whitelist for meta-openembedded/meta-filesystems
-PNWHITELIST_filesystems-layer_append = " \
- aufs-util \
- fuse \
- xfsdump \
- xfsprogs \
-"
-
-PNWHITELIST_dpdk_append = " \
- dpdk \
-"
-
-PNWHITELIST_meta-python_append = " \
- python3-automat \
- python3-click \
- python3-constantly \
- python3-hyperlink \
- python3-incremental \
- python3-twisted \
- python3-zopeinterface \
- python-cython \
- python-prettytable \
- python-protobuf \
- python-pyparsing \
-"
-
-PNWHITELIST_networking-layer_append = " \
- bridge-utils \
- ebtables \
- netcf \
- tunctl \
- spice \
- spice-protocol \
-"
-
-# Whitelist for meta-openembedded/meta-oe
-PNWHITELIST_openembedded-layer_append = " \
- augeas \
- gd \
- gnulib \
- hwloc \
- libedit \
- leveldb \
- lua \
- numactl \
- protobuf \
- protobuf-c \
- rocksdb \
- yajl \
- libnet \
- snappy \
- zabbix \
- openldap \
- byacc \
- cpufrequtils \
- cpupower \
- msr-tools \
- htop \
-"
-
-# Whitelist for meta-realtime
-PNWHITELIST_realtime_append = " \
- schedtool-dl \
-"
-
-# Whitelist for meta-virtualization
-PNWHITELIST_virtualization-layer_append = " \
- ceph \
- cgroup-lite \
- cni \
- compose-file \
- containerd-opencontainers \
- diod \
- docker \
- docker-distribution \
- tini \
- go-systemd \
- go-capability \
- grpc-go \
- go-logrus \
- go-pty \
- go-mux \
- go-distribution \
- go-patricia \
- go-fsnotify \
- go-dbus \
- go-context \
- go-cli \
- go-connections \
- go-cross-x86_64 \
- go-bootstrap-native \
- libvirt \
- lxc \
- nagios-core \
- nagios-nrpe \
- nagios-nsca \
- nagios-plugins \
- notary \
- oath \
- openvswitch \
- runc-docker \
- libvmi \
-"
-
-# Whitelist for meta-webserver
-PNWHITELIST_webserver_append = " \
- fcgi \
-"
-
-PNWHITELIST_security_append = " \
- keyutils \
-"
diff --git a/meta-oran/conf/distro/oran-inf.conf b/meta-oran/conf/distro/oran-inf.conf
deleted file mode 100644
index f5f88b7..0000000
--- a/meta-oran/conf/distro/oran-inf.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-#@TYPE: Distro
-#@NAME: O-RAN INF
-#@DESCRIPTION: O-RAN INF Distribution
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
-PREFERRED_VERSION_linux-yocto-rt = "4.18%"
-
-require conf/distro/wrlinux.conf
-require conf/distro/include/oran-whitelist.conf
-
-# Note that layer.conf will only add items to BBFILES for
-# the wrlinux-oran distro (this one).
-#
-DISTRO_NAME = "O-RAN-INF"
-
-# Set software versions
-PREFERRED_VERSION_dpdk ?= "19.11%"
-PREFERRED_VERSION_kubernetes ?= "1.16.2%"
-GOVERSION ?= "1.12%"
-
-# Set preferred providers
-PREFERRED_PROVIDER_virtual/monitoring ?= "${@bb.utils.contains('MONITORING_FEATURES', 'zabbix', 'packagegroup-zabbix-monitoring',\
- bb.utils.contains('MONITORING_FEATURES', 'nagios', 'packagegroup-nagios-monitoring', 'packagegroup-empty-monitoring', d),d)}"
-
-PREFERRED_PROVIDER_virtual/libibverbs ?= "libibverbs"
-
-# By default including meta-oran layer will build Nagios core
-MONITORING_FEATURES ?= "nagios core"
-
-DISTRO_FEATURES_append = " virtualization kvm"
-NON_MULTILIB_RECIPES_append = " ceph"
-
-# For images
-IMAGE_OVERHEAD_FACTOR ="1.1"
-IMAGE_FSTYPES += "tar.bz2 wic.qcow2"
-
-# Use the default splash
-SYSLINUX_SPLASH = ""
-
-# The recipe in oe-core is only capable of running "make scripts" and compiling
-# kernel modules, so add it into bbmask and use the one in meta-oran
-BBMASK += "/oe-core/meta/recipes-kernel/linux/kernel-devsrc.bb"
diff --git a/meta-oran/conf/layer.conf b/meta-oran/conf/layer.conf
deleted file mode 100644
index 3c7b8ad..0000000
--- a/meta-oran/conf/layer.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2019 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 a packages directory, add to BBFILES
-BBFILES += " \
- ${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend \
-"
-
-BBFILE_COLLECTIONS += "meta-oran"
-BBFILE_PATTERN_meta-oran = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-oran = "7"
-
-
-LAYERVERSION_meta-oran = "1"
-
-LAYERSERIES_COMPAT_meta-oran = "thud wrl"
-
-LAYER_PATH_meta-oran = "${LAYERDIR}"
-
-LAYERDEPENDS_meta-oran = " \
- cloud-services-layer \
- core \
- dpdk \
- realtime \
- virtualization-layer \
- wr-template \
- wrlinux \
- wrlinux-distro \
-"
-
-LAYERRECOMMENDS_meta-oran = " \
- meta-anaconda \
-"
-
-PNWHITELIST_LAYERS_remove = "meta-oran wrlinux-distro"
-
-TEMPLATES_PATH = "${LAYER_PATH_meta-oran}/templates"
diff --git a/meta-oran/recipes-base/images/oran-image-inf-guest.bb b/meta-oran/recipes-base/images/oran-image-inf-guest.bb
deleted file mode 100644
index 9551e06..0000000
--- a/meta-oran/recipes-base/images/oran-image-inf-guest.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-DESCRIPTION = "An image suitable for a O-RAN INF guest."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-require recipes-base/images/oran-image-inf-minimal.bb
-
-IMAGE_INSTALL += " \
- acpid-default-scripts \
- hwloc \
- kernel-modules \
- packagegroup-base-extended \
- packagegroup-oran-trace-tools \
- packagegroup-wr-base \
- packagegroup-wr-base-net \
-"
-IMAGE_INSTALL_append_qemux86-64 = " dpdk"
-
-IMAGE_FEATURES += " \
- nfs-server \
- package-management \
- wr-core-db \
- wr-core-interactive \
- wr-core-net \
- wr-core-perl \
- wr-core-python \
- wr-core-sys-util \
- wr-core-util \
- wr-core-mail \
-"
-
-COMPATIBLE_MACHINE = "qemux86|qemux86-64"
diff --git a/meta-oran/recipes-base/images/oran-image-inf-host.bb b/meta-oran/recipes-base/images/oran-image-inf-host.bb
deleted file mode 100644
index 5fee605..0000000
--- a/meta-oran/recipes-base/images/oran-image-inf-host.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-DESCRIPTION = "An image suitable for a O-RAN INF host."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-require recipes-base/images/oran-image-inf-minimal.bb
-
-IMAGE_INSTALL += " \
- aufs-util \
- celt051 \
- dpdk \
- hwloc \
- kernel-modules \
- openvswitch \
- packagegroup-base-extended \
- packagegroup-oran \
- packagegroup-wr-base \
- packagegroup-wr-base-net \
- python-pyparsing \
- rt-tests \
- schedtool-dl \
-"
-
-IMAGE_INSTALL_append_x86-64 = " \
- ceph \
- spice \
-"
-
-IMAGE_FEATURES += " \
- nfs-server \
- package-management \
- wr-core-db \
- wr-core-interactive \
- wr-core-net \
- wr-core-perl \
- wr-core-python \
- wr-core-sys-util \
- wr-core-util \
- wr-core-mail \
-"
-
-# enable build out .ext3 image file, shall be useful for qemu
-IMAGE_FSTYPES += "ext3"
diff --git a/meta-oran/recipes-base/images/oran-image-inf-minimal.bb b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb
deleted file mode 100644
index 23662dd..0000000
--- a/meta-oran/recipes-base/images/oran-image-inf-minimal.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-DESCRIPTION = "An image suitable for a minimal O-RAN guest or host."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-IMAGE_INSTALL = " \
- packagegroup-core-boot \
- packagegroup-oran-vm \
-"
-
-inherit wrlinux-image
diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
deleted file mode 100644
index 550a3dc..0000000
--- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-DESCRIPTION = "Packagegroup for ORAN packages"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES += " \
- ${PN}-base \
- ${PN}-docker \
- ${PN}-kernel \
- ${PN}-k8s \
- ${PN}-vm \
- ${PN}-trace-tools \
- ${PN}-lttng-toolchain \
- ${PN}-glusterfs \
-"
-
-RDEPENDS_${PN} = "\
- ${PN}-base \
- ${PN}-docker \
- ${PN}-kernel \
- ${PN}-k8s \
- ${PN}-vm \
- ${PN}-trace-tools \
- ${PN}-lttng-toolchain \
- ${PN}-glusterfs \
-"
-
-RDEPENDS_${PN}-base = "\
- vim \
- rt-tests \
- tunctl \
- udev \
- udev-extraconf \
- cpupower \
- cpufrequtils \
- htop \
-"
-
-RDEPENDS_${PN}-base_append_x86 = "\
- turbostat \
- msr-tools \
-"
-
-RDEPENDS_${PN}-base_append_x86-64 = "\
- turbostat \
- msr-tools \
-"
-
-RDEPENDS_${PN}-docker = "\
- docker \
- docker-registry \
-"
-
-RDEPENDS_${PN}-kernel = "\
- kernel-base \
- kernel-dev \
- kernel-devsrc \
- kernel-modules \
- kernel-vmlinux \
-"
-RDEPENDS_${PN}-k8s = "\
- cni \
- flannel \
- iproute2-tc \
- kubernetes \
- kubernetes-dashboard \
- node-feature-discovery \
- multus-cni \
-"
-
-RDEPENDS_${PN}-vm = "\
- qemu \
- libvirt \
- libvirt-libvirtd \
- libvirt-virsh \
- libvmi \
-"
-
-RRECOMMENDS_${PN}-vm = "\
- kernel-module-kvm \
- kernel-module-kvm-intel \
- kernel-module-kvm-amd \
-"
-
-RDEPENDS_${PN}-trace-tools = "\
- socat \
-"
-# It's blacklisted becasue of build failure
-# diod
-
-RDEPENDS_${PN}-lttng-toolchain = "\
- babeltrace \
- lttng-tools \
- lttng-ust \
-"
-
-RDEPENDS_${PN}-glusterfs = "\
- fuse \
- fuse-utils \
- libulockmgr \
- glusterfs \
- glusterfs-rdma \
- glusterfs-geo-replication \
- glusterfs-fuse \
- glusterfs-server \
- xfsdump \
- xfsprogs \
-"
diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend b/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend
deleted file mode 100644
index 9b4fcc1..0000000
--- a/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-REQUIRED_DISTRO_FEATURES_remove = "x11 opengl"
-PACKAGES_remove = "packagegroup-self-hosted-graphics"
-RDEPENDS_packagegroup-self-hosted_remove = "packagegroup-self-hosted-graphics"
-RDEPENDS_packagegroup-self-hosted-extended_remove = "settings-daemon"
diff --git a/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend b/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend
deleted file mode 100644
index 5be40e2..0000000
--- a/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-inherit go112
diff --git a/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend b/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend
deleted file mode 100644
index 5be40e2..0000000
--- a/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-inherit go112
diff --git a/meta-oran/recipes-containers/docker/docker_%.bbappend b/meta-oran/recipes-containers/docker/docker_%.bbappend
deleted file mode 100644
index b1f0d42..0000000
--- a/meta-oran/recipes-containers/docker/docker_%.bbappend
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-inherit go112
-
-do_install_append() {
- sed -i '/ExecStart=/a ExecStartPost=/usr/sbin/iptables -P FORWARD ACCEPT' ${D}${systemd_unitdir}/system/docker.service
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes/cmk-cluster-init-pod-template.yaml b/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes/cmk-cluster-init-pod-template.yaml
deleted file mode 100644
index 3ea5318..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes/cmk-cluster-init-pod-template.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2017 Intel Corporation
-#
-# 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.
-#
-apiVersion: v1
-kind: Pod
-metadata:
- labels:
- app: cmk-cluster-init-pod
- name: cmk-cluster-init-pod
- #namespace: user-supplied-namespace
-spec:
- serviceAccountName: cmk-serviceaccount
- containers:
- - args:
- # Change this value to pass different options to cluster-init.
- - "/cmk/cmk.py cluster-init --host-list=$HOST_LIST --saname=cmk-serviceaccount --num-exclusive-cores=$NUM_EXCLUSIVE_CORES --num-shared-cores=$NUM_SHARED_CORES --cmk-img=$CMK_IMG"
- command:
- - "/bin/bash"
- - "-c"
- image: cmk:v1.3.1
- name: cmk-cluster-init-pod
- env:
- - name: HOST_LIST
- value: "oran-master"
- - name: NUM_EXCLUSIVE_CORES
- value: "4"
- - name: NUM_SHARED_CORES
- value: "1"
- - name: CMK_IMG
- value: "cmk:v1.3.1"
- restartPolicy: Never
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes/cmk-requirements.txt-add-urllib3-1.24.patch b/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes/cmk-requirements.txt-add-urllib3-1.24.patch
deleted file mode 100644
index de8ca22..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes/cmk-requirements.txt-add-urllib3-1.24.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c0a24da25fed6503ae1eafc92d6d91277091039d Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 28 Oct 2019 16:20:54 +0800
-Subject: [PATCH] requirements.txt: add urllib3<1.24
-
-Fixed the issue:
-/usr/local/lib/python3.4/site-packages/requests/__init__.py:91:
-RequestsDependencyWarning: urllib3 (1.25.6) or chardet (3.0.4) doesn't
-match a supported version!
- RequestsDependencyWarning)
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- requirements.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/requirements.txt b/requirements.txt
-index 64f8999..534b542 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -10,3 +10,4 @@ cryptography>=2.3, <=2.4.2
- yamlreader==3.0.4
- pluggy>=0.5, <0.7
- packaging==17.1
-+urllib3<1.24
---
-2.7.4
-
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb b/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb
deleted file mode 100644
index c534c73..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/cpu-manager-for-kubernetes_1.3.1.bb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2019 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 = "CPU Manager for Kubernetes"
-uDESCRIPTION = "\
- This project provides basic core affinity for NFV-style workloads \
- on top of vanilla Kubernetes v1.5+. \
- This project ships a single multi-use command-line program to perform \
- various functions for host configuration, managing groups of CPUs, \
- and constraining workloads to specific CPUs. \
-"
-HOMEPAGE = "https://github.com/intel/CPU-Manager-for-Kubernetes"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d62f25248fea71c71fb2b520c72b5171"
-
-SRC_URI = "\
- https://github.com/intel/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
- file://cmk-requirements.txt-add-urllib3-1.24.patch \
- file://cmk-cluster-init-pod-template.yaml \
-"
-
-SRC_URI[md5sum] = "5ec9f665524b86654dedb2e6826851ed"
-SRC_URI[sha256sum] = "e86feb81751c6715247577c47070beca273022b470ae09c856e6da72f185688f"
-
-S = "${WORKDIR}/CPU-Manager-for-Kubernetes-${PV}"
-
-K8S_PLUGINS_SRC = "/opt/kubernetes_plugins/${BPN}"
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_configure() {
- :
-}
-
-do_compile() {
- :
-}
-
-do_install() {
- # Install the config files
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${S}/resources/authorization/cmk-serviceaccount.yaml ${D}${K8S_PLUGINS}
- install -m 644 ${S}/resources/authorization/cmk-rbac-rules.yaml ${D}${K8S_PLUGINS}
- install -m 644 ${WORKDIR}/cmk-cluster-init-pod-template.yaml ${D}${K8S_PLUGINS}
-
- # Install all the src
- install -d ${D}${K8S_PLUGINS_SRC}
- cp -a --no-preserve=ownership ${S}/* ${D}${K8S_PLUGINS_SRC}
-}
-
-FILES_${PN} += "${K8S_PLUGINS_SRC}"
-
-# provides a short alias
-RPROVIDES_${PN} = "cmk"
-
-INSANE_SKIP_${PN} = "file-rdeps"
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb
deleted file mode 100644
index 539aa8a..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2019 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 = "Flannel is a simple and easy way to configure a layer 3 network fabric designed for Kubernetes."
-DESCRIPTION = "\
- Flannel runs a small, single binary agent called flanneld on each host, \
- and is responsible for allocating a subnet lease to each host out of a \
- larger, preconfigured address space. Flannel uses either the Kubernetes \
- API or etcd directly to store the network configuration, the allocated \
- subnets, and any auxiliary data (such as the host's public IP). Packets \
- are forwarded using one of several backend mechanisms including VXLAN and \
- various cloud integrations. \
-"
-HOMEPAGE = "https://github.com/coreos/flannel"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "\
- https://github.com/coreos/flannel/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "e023f76c688fd74dce6c0c8df8bea5d7"
-SRC_URI[sha256sum] = "476c886ddc06a8afcf54e181ac55579224c6be424089567a0b8d9e93dd08a053"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
- install -m 644 ${S}/Documentation/kube-flannel.yml ${D}${K8S_PLUGINS}
- sed -i -e 's/v0.10.0/v0.11.0/' ${D}${K8S_PLUGINS}/kube-flannel.yml
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.12.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.12.0.bb
deleted file mode 100644
index abc4796..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.12.0.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2019 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 = "Flannel is a simple and easy way to configure a layer 3 network fabric designed for Kubernetes."
-DESCRIPTION = "\
- Flannel runs a small, single binary agent called flanneld on each host, \
- and is responsible for allocating a subnet lease to each host out of a \
- larger, preconfigured address space. Flannel uses either the Kubernetes \
- API or etcd directly to store the network configuration, the allocated \
- subnets, and any auxiliary data (such as the host's public IP). Packets \
- are forwarded using one of several backend mechanisms including VXLAN and \
- various cloud integrations. \
-"
-HOMEPAGE = "https://github.com/coreos/flannel"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "\
- https://github.com/coreos/flannel/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "1007747571bc6b8c951f72f64e567205"
-SRC_URI[sha256sum] = "7375318b288bcff733aabfe1a1007d478cb9091cdaffe68c8253ddd93bc070ed"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
- install -m 644 ${S}/Documentation/kube-flannel.yml ${D}${K8S_PLUGINS}
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard/kubernetes-dashboard-admin.rbac.yaml b/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard/kubernetes-dashboard-admin.rbac.yaml
deleted file mode 100644
index 9fe2878..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard/kubernetes-dashboard-admin.rbac.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- labels:
- k8s-app: kubernetes-dashboard
- name: kubernetes-dashboard-admin
- namespace: kube-system
-
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
- name: kubernetes-dashboard-admin
- labels:
- k8s-app: kubernetes-dashboard
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: cluster-admin
-subjects:
-- kind: ServiceAccount
- name: kubernetes-dashboard-admin
- namespace: kube-system
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard/kubernetes-dashboard.yaml-set-the-NodePort-type.patch b/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard/kubernetes-dashboard.yaml-set-the-NodePort-type.patch
deleted file mode 100644
index e689e40..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard/kubernetes-dashboard.yaml-set-the-NodePort-type.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 72c0b14297b4bcb1c8e9d78ab2a83dff1f0b4cb5 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 21 Oct 2019 16:26:20 +0800
-Subject: [PATCH] kubernetes-dashboard.yaml: set the NodePort type
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- src/deploy/recommended/kubernetes-dashboard.yaml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/deploy/recommended/kubernetes-dashboard.yaml b/src/deploy/recommended/kubernetes-dashboard.yaml
-index 73fcc23..878f6de 100644
---- a/src/deploy/recommended/kubernetes-dashboard.yaml
-+++ b/src/deploy/recommended/kubernetes-dashboard.yaml
-@@ -143,7 +143,7 @@ spec:
- secretName: kubernetes-dashboard-certs
- - name: tmp-volume
- emptyDir: {}
-- serviceAccountName: kubernetes-dashboard
-+ serviceAccountName: kubernetes-dashboard-admin
- # Comment the following tolerations if Dashboard must not be deployed on master
- tolerations:
- - key: node-role.kubernetes.io/master
-@@ -160,8 +160,10 @@ metadata:
- name: kubernetes-dashboard
- namespace: kube-system
- spec:
-+ type: NodePort
- ports:
- - port: 443
-+ nodePort: 30443
- targetPort: 8443
- selector:
- k8s-app: kubernetes-dashboard
---
-2.7.4
-
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.10.1.bb b/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.10.1.bb
deleted file mode 100644
index 2428020..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.10.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2019 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 = "General-purpose web UI for Kubernetes clusters"
-DESCRIPTION = "\
- Kubernetes Dashboard is a general purpose, web-based UI \
- for Kubernetes clusters. It allows users to manage applications \
- running in the cluster and troubleshoot them, as well as manage \
- the cluster itself. \
-"
-HOMEPAGE = "https://github.com/kubernetes/dashboard"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
-
-SRC_URI = "\
- https://github.com/kubernetes/dashboard/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
- file://kubernetes-dashboard-admin.rbac.yaml \
- file://kubernetes-dashboard.yaml-set-the-NodePort-type.patch \
-"
-
-SRC_URI[md5sum] = "52c30b2c4e9cfc31a1ea67144e81513f"
-SRC_URI[sha256sum] = "088ba30335e2effec4c5386e97ef25f47f9d042b99bbdeba9a1e3faf87ad2a6d"
-
-S = "${WORKDIR}/dashboard-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${WORKDIR}/kubernetes-dashboard-admin.rbac.yaml ${D}${K8S_PLUGINS}
- install -m 644 ${S}/src/deploy/recommended/kubernetes-dashboard.yaml ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb b/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb
deleted file mode 100644
index 370c997..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/kubernetes-dashboard_1.8.3.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2019 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 = "General-purpose web UI for Kubernetes clusters"
-DESCRIPTION = "\
- Kubernetes Dashboard is a general purpose, web-based UI \
- for Kubernetes clusters. It allows users to manage applications \
- running in the cluster and troubleshoot them, as well as manage \
- the cluster itself. \
-"
-HOMEPAGE = "https://github.com/kubernetes/dashboard"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b1e01b26bacfc2232046c90a330332b3"
-
-SRC_URI = "\
- https://github.com/kubernetes/dashboard/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
- file://kubernetes-dashboard-admin.rbac.yaml \
- file://kubernetes-dashboard.yaml-set-the-NodePort-type.patch \
-"
-
-SRC_URI[md5sum] = "8c3949eea7b9f7dd15d70d7d1c9af77b"
-SRC_URI[sha256sum] = "9096f86d4107a6d23f2cff5edd1acae2faf25719a343c319860fd6a7408f761d"
-
-S = "${WORKDIR}/dashboard-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${WORKDIR}/kubernetes-dashboard-admin.rbac.yaml ${D}${K8S_PLUGINS}
- install -m 644 ${S}/src/deploy/recommended/kubernetes-dashboard.yaml ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb b/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb
deleted file mode 100644
index d4b023b..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/multus-cni_3.3.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2019 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 = "Multus CNI enables attaching multiple network interfaces to pods in Kubernetes."
-DESCRIPTION = "\
- Multus CNI is a container network interface (CNI) plugin for Kubernetes \
- that enables attaching multiple network interfaces to pods. Typically, \
- in Kubernetes each pod only has one network interface (apart from a loopback) \
- -- with Multus you can create a multi-homed pod that has multiple interfaces. \
- This is accomplished by Multus acting as a "meta-plugin", a CNI plugin that \
- can call multiple other CNI plugins \
-"
-HOMEPAGE = "https://github.com/intel/multus-cni"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-
-SRC_URI = "\
- https://github.com/intel/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "fa75272319b19a6192f9d607b79829ea"
-SRC_URI[sha256sum] = "9544fca58e6d1f3943159086651ceb228242b5fd85688bd424d7504c197ec49a"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
- install -m 644 ${S}/images/entrypoint.sh ${D}${K8S_PLUGINS}
- install -m 644 ${S}/images/README.md ${D}${K8S_PLUGINS}/README-deployment.md
- install -m 644 ${S}/images/multus-daemonset-pre-1.16.yml ${D}${K8S_PLUGINS}/multus-daemonset-pre-1.16.yml
- install -m 644 ${S}/images/multus-daemonset.yml ${D}${K8S_PLUGINS}/multus-daemonset.yml
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb
deleted file mode 100644
index 7c5b9e4..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.4.0.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2019 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 = "Node feature discovery for Kubernetes"
-DESCRIPTION = "\
- This software enables node feature discovery for Kubernetes. \
- It detects hardware features available on each node in a Kubernetes \
- cluster, and advertises those features using node labels. \
- \
- NFD consists of two software components: \
- - nfd-master is responsible for labeling Kubernetes node objects \
- - nfd-worker is detects features and communicates them to nfd-master. \
- One instance of nfd-worker is supposed to be run on each node of the \
- cluster \
-"
-HOMEPAGE = "https://github.com/kubernetes-sigs/node-feature-discovery"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa"
-
-SRC_URI = "\
- https://github.com/kubernetes-sigs/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "16bcac1d904351a88faa5c6752420ce5"
-SRC_URI[sha256sum] = "c9f826e6c7a42161befc155ca0f465ac5667903e74c857e978a99c74574f635e"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_configure() {
- :
-}
-
-do_compile() {
- :
-}
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-daemonset-combined.yaml.template ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-worker.conf.example ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-worker-job.yaml.template ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-master.yaml.template ${D}${K8S_PLUGINS}/nfd-master.yaml
- install -m 644 ${S}/nfd-worker-daemonset.yaml.template ${D}${K8S_PLUGINS}/nfd-worker-daemonset.yaml
-}
diff --git a/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.5.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.5.0.bb
deleted file mode 100644
index 56fc71e..0000000
--- a/meta-oran/recipes-containers/kubernetes-plugins/node-feature-discovery_0.5.0.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2019 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 = "Node feature discovery for Kubernetes"
-DESCRIPTION = "\
- This software enables node feature discovery for Kubernetes. \
- It detects hardware features available on each node in a Kubernetes \
- cluster, and advertises those features using node labels. \
- \
- NFD consists of two software components: \
- - nfd-master is responsible for labeling Kubernetes node objects \
- - nfd-worker is detects features and communicates them to nfd-master. \
- One instance of nfd-worker is supposed to be run on each node of the \
- cluster \
-"
-HOMEPAGE = "https://github.com/kubernetes-sigs/node-feature-discovery"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa"
-
-SRC_URI = "\
- https://github.com/kubernetes-sigs/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "8130b178e2d5f5aadcec95210b2882d5"
-SRC_URI[sha256sum] = "f351d69e3dbc0e8babe4365e0b5a766cf69e566f89c0191e686f653e17e50b6d"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
-
-do_configure() {
- :
-}
-
-do_compile() {
- :
-}
-
-do_install() {
- install -d ${D}${K8S_PLUGINS}
- install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-daemonset-combined.yaml.template ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-worker.conf.example ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-worker-job.yaml.template ${D}${K8S_PLUGINS}
- install -m 644 ${S}/nfd-master.yaml.template ${D}${K8S_PLUGINS}/nfd-master.yaml
- install -m 644 ${S}/nfd-worker-daemonset.yaml.template ${D}${K8S_PLUGINS}/nfd-worker-daemonset.yaml
-}
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes.inc b/meta-oran/recipes-containers/kubernetes/kubernetes.inc
deleted file mode 100644
index e0d839c..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2019 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 recipes-containers/kubernetes/kubernetes_git.bb
-
-SRC_URI = " \
- git://github.com/kubernetes/kubernetes.git;branch=${SRC_BRANCH};name=kubernetes \
- file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
- file://0001-cross-don-t-build-tests-by-default.patch \
- "
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch b/meta-oran/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch
deleted file mode 100644
index 659e301..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes/0001-cross-don-t-build-tests-by-default.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fa912b53186a047d787c8c456156b9dbdcdf040d Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Thu, 1 Nov 2018 10:21:10 -0400
-Subject: [PATCH] cross: don't build tests by default
-
-The hack/* build infrastructure doesn't respect the WHAT= commands
-that the make infrastructure provides to limit what is built.
-
-In our case, we are cross building and can't build the server test
-components without error. As such, we patch the targets out of the
-script to allow a successful build.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- hack/make-rules/cross.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/import/hack/make-rules/cross.sh b/hack/make-rules/cross.sh
-index 8e1e938..0898c5c 100755
---- a/src/import/hack/make-rules/cross.sh
-+++ b/src/import/hack/make-rules/cross.sh
-@@ -33,6 +33,6 @@ make all WHAT="${KUBE_NODE_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_NODE_PLATFO
-
- make all WHAT="${KUBE_CLIENT_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_CLIENT_PLATFORMS[*]}"
-
--make all WHAT="${KUBE_TEST_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_PLATFORMS[*]}"
-+#make all WHAT="${KUBE_TEST_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_PLATFORMS[*]}"
-
--make all WHAT="${KUBE_TEST_SERVER_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_SERVER_PLATFORMS[*]}"
-+#make all WHAT="${KUBE_TEST_SERVER_TARGETS[*]}" KUBE_BUILD_PLATFORMS="${KUBE_TEST_SERVER_PLATFORMS[*]}"
---
-2.7.4
-
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch b/meta-oran/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
deleted file mode 100644
index 62d0521..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9cbb2d523d481053d405ebac830c2074b00d3417 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen.kooi@linaro.org>
-Date: Mon, 23 Jul 2018 15:28:02 +0200
-Subject: [PATCH] hack/lib/golang.sh: use CC from environment
-
-Toolchain tupples differs, especially when using vendor provides ones.
-
-Upstream-status: Inappropriate [embedded specific]
-Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
----
- hack/lib/golang.sh | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index c5d4634..563e2b4b 100755
---- a/src/import/hack/lib/golang.sh
-+++ b/src/import/hack/lib/golang.sh
-@@ -278,19 +278,15 @@ kube::golang::set_platform_envs() {
- case "${platform}" in
- "linux/arm")
- export CGO_ENABLED=1
-- export CC=arm-linux-gnueabihf-gcc
- ;;
- "linux/arm64")
- export CGO_ENABLED=1
-- export CC=aarch64-linux-gnu-gcc
- ;;
- "linux/ppc64le")
- export CGO_ENABLED=1
-- export CC=powerpc64le-linux-gnu-gcc
- ;;
- "linux/s390x")
- export CGO_ENABLED=1
-- export CC=s390x-linux-gnu-gcc
- ;;
- esac
- fi
---
-2.9.5
-
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf b/meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf
deleted file mode 100644
index e952d71..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf
+++ /dev/null
@@ -1 +0,0 @@
-vm.swappiness=0
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/kubeadm.conf b/meta-oran/recipes-containers/kubernetes/kubernetes/kubeadm.conf
deleted file mode 100644
index 2fb25ba..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes/kubeadm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Note: This dropin only works with kubeadm and kubelet v1.11+
-[Service]
-Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
-Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
-# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
-EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
-# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
-# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
-EnvironmentFile=-/etc/sysconfig/kubelet
-ExecStart=
-ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
-ExecStartPre=-/usr/bin/kubelet-cgroup-setup.sh
-ExecStartPost=/bin/bash -c 'echo $MAINPID > /var/run/kubelet.pid;'
-ExecStopPost=/bin/rm -f /var/run/kubelet.pid
-Restart=always
-StartLimitInterval=0
-RestartSec=10
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/kubelet-cgroup-setup.sh b/meta-oran/recipes-containers/kubernetes/kubernetes/kubelet-cgroup-setup.sh
deleted file mode 100644
index 7efb27a..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes/kubelet-cgroup-setup.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# This script does minimal cgroup setup for kubelet. This creates k8s-infra
-# cgroup for a minimal set of resource controllers, and configures cpuset
-# attributes to span all online cpus and nodes. This will do nothing if
-# the k8s-infra cgroup already exists (i.e., assume already configured).
-# NOTE: The creation of directories under /sys/fs/cgroup is volatile, and
-# does not persist reboots. The cpuset.mems and cpuset.cpus is later updated
-# by puppet kubernetes.pp manifest.
-#
-
-# Define minimal path
-PATH=/bin:/usr/bin:/usr/local/bin
-
-# Log info message to /var/log/daemon.log
-function LOG {
- logger -p daemon.info "$0($$): $@"
-}
-
-# Log error message to /var/log/daemon.log
-function ERROR {
- logger -s -p daemon.error "$0($$): ERROR: $@"
-}
-
-# Create minimal cgroup directories and configure cpuset attributes
-# pids should be first in the list, since it appears to get auto deleted
-function create_cgroup {
- local cg_name=$1
- local cg_nodeset=$2
- local cg_cpuset=$3
-
- local CGROUP=/sys/fs/cgroup
- local CONTROLLERS=("pids" "cpuset" "memory" "cpu,cpuacct" "systemd")
- local cnt=''
- local CGDIR=''
- local RC=0
-
- # Create the cgroup for required controllers
- for cnt in ${CONTROLLERS[@]}; do
- CGDIR=${CGROUP}/${cnt}/${cg_name}
- if [ -d ${CGDIR} ]; then
- LOG "Nothing to do, already configured: ${CGDIR}."
- exit ${RC}
- fi
- LOG "Creating: ${CGDIR}"
- mkdir -p ${CGDIR}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Creating: ${CGDIR}, rc=${RC}"
- exit ${RC}
- fi
- done
-
- # Customize cpuset attributes
- LOG "Configuring cgroup: ${cg_name}, nodeset: ${cg_nodeset}, cpuset: ${cg_cpuset}"
- CGDIR=${CGROUP}/cpuset/${cg_name}
- local CGMEMS=${CGDIR}/cpuset.mems
- local CGCPUS=${CGDIR}/cpuset.cpus
- local CGTASKS=${CGDIR}/tasks
-
- # Assign cgroup memory nodeset
- LOG "Assign nodeset ${cg_nodeset} to ${CGMEMS}"
- /bin/echo ${cg_nodeset} > ${CGMEMS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Unable to write to: ${CGMEMS}, rc=${RC}"
- exit ${RC}
- fi
-
- # Assign cgroup cpus
- LOG "Assign cpuset ${cg_cpuset} to ${CGCPUS}"
- /bin/echo ${cg_cpuset} > ${CGCPUS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Assigning: ${cg_cpuset} to ${CGCPUS}, rc=${RC}"
- exit ${RC}
- fi
-
- # Set file ownership
- chown root:root ${CGMEMS} ${CGCPUS} ${CGTASKS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Setting owner for: ${CGMEMS}, ${CGCPUS}, ${CGTASKS}, rc=${RC}"
- exit ${RC}
- fi
-
- # Set file mode permissions
- chmod 644 ${CGMEMS} ${CGCPUS} ${CGTASKS}
- RC=$?
- if [ ${RC} -ne 0 ]; then
- ERROR "Setting mode for: ${CGMEMS}, ${CGCPUS}, ${CGTASKS}, rc=${RC}"
- exit ${RC}
- fi
-
- return ${RC}
-}
-
-if [ $UID -ne 0 ]; then
- ERROR "Require sudo/root."
- exit 1
-fi
-
-# Configure default kubepods cpuset to span all online cpus and nodes.
-ONLINE_NODESET=$(/bin/cat /sys/devices/system/node/online)
-ONLINE_CPUSET=$(/bin/cat /sys/devices/system/cpu/online)
-
-# Configure kubelet cgroup to match cgroupRoot.
-create_cgroup 'k8s-infra' ${ONLINE_NODESET} ${ONLINE_CPUSET}
-
-exit $?
-
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/kubernetes-accounting.conf b/meta-oran/recipes-containers/kubernetes/kubernetes/kubernetes-accounting.conf
deleted file mode 100644
index 1e8065e..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes/kubernetes-accounting.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Manager]
-DefaultCPUAccounting=yes
-DefaultMemoryAccounting=yes
-
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.13.5.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.13.5.bb
deleted file mode 100644
index bba1abe..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.13.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2019 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 kubernetes.inc
-
-PV = "1.13.5+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "2166946f41b36dea2c4626f90a77706f426cdea2"
-SRC_BRANCH = "release-1.13"
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.13.9.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.13.9.bb
deleted file mode 100644
index 5e84205..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.13.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2019 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 kubernetes.inc
-
-PV = "1.13.9+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "3e4f6a92de5f259ef313ad876bb008897f6a98f0"
-SRC_BRANCH = "release-1.13"
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.14.1.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.14.1.bb
deleted file mode 100644
index 3117cdd..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.14.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2019 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 kubernetes.inc
-
-PV = "1.14.1+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "b7394102d6ef778017f2ca4046abbaa23b88c290"
-SRC_BRANCH = "release-1.14"
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.14.5.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.14.5.bb
deleted file mode 100644
index 4e79e25..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.14.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2019 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 kubernetes.inc
-
-PV = "1.14.5+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "0e9fcb426b100a2aea5ed5c25b3d8cfbb01a8acf"
-SRC_BRANCH = "release-1.14"
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
deleted file mode 100644
index 462b048..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (C) 2019 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 kubernetes.inc
-
-PV = "1.15.2+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "f6278300bebbb750328ac16ee6dd3aa7d3549568"
-SRC_BRANCH = "release-1.15"
-
-SRC_URI += "\
- file://k8s.conf \
-"
-
-inherit go112
-
-do_install_append() {
- # Install the sysctl config for k8s
- install -d ${D}${sysconfdir}/sysctl.d/
- install -m 644 -D ${WORKDIR}/k8s.conf ${D}${sysconfdir}/sysctl.d/
-}
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.16.2.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.16.2.bb
deleted file mode 100644
index 02142f0..0000000
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.16.2.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2019 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 kubernetes.inc
-
-PV = "1.16.2+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "c97fe5036ef3df2967d086711e6c0c405941e14b"
-SRC_BRANCH = "release-1.16"
-
-SRC_URI += "\
- file://kubernetes-accounting.conf \
- file://kubeadm.conf \
- file://kubelet-cgroup-setup.sh \
-"
-
-INSANE_SKIP_${PN} += "textrel"
-INSANE_SKIP_${PN}-misc += "textrel"
-INSANE_SKIP_kubelet += "textrel"
-
-SYSTEMD_AUTO_ENABLE_kubelet = "disable"
-
-inherit go112
-
-do_install_append() {
- # Install the sysctl config for k8s
- # install -d ${D}${sysconfdir}/sysctl.d/
- # install -m 644 -D ${WORKDIR}/k8s.conf ${D}${sysconfdir}/sysctl.d/
-
- # kubeadm:
- install -d -m 0755 ${D}/${sysconfdir}/systemd/system/kubelete.service.d
- install -m 0644 ${WORKDIR}/kubeadm.conf ${D}/${sysconfdir}/systemd/system/kubelete.service.d
-
- # kubelete-cgroup-setup.sh
- install -d -m 0755 ${D}/${bindir}
- install -m 0644 ${WORKDIR}/kubelet-cgroup-setup.sh ${D}/${bindir}
-
- # enable CPU and Memory accounting
- install -d -m 0755 ${D}/${sysconfdir}/systemd/system.conf.d
- install -m 0644 ${WORKDIR}/kubernetes-accounting.conf ${D}/${sysconfdir}//systemd/system.conf.d/
-}
-
diff --git a/meta-oran/recipes-containers/runc/runc-docker_git.bbappend b/meta-oran/recipes-containers/runc/runc-docker_git.bbappend
deleted file mode 100644
index 5be40e2..0000000
--- a/meta-oran/recipes-containers/runc/runc-docker_git.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-inherit go112
diff --git a/meta-oran/recipes-core/initrdscripts/files/init-install-efi.sh b/meta-oran/recipes-core/initrdscripts/files/init-install-efi.sh
deleted file mode 100644
index 46a6e36..0000000
--- a/meta-oran/recipes-core/initrdscripts/files/init-install-efi.sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (c) 2012, Intel Corporation.
-# All rights reserved.
-#
-# install.sh [device_name] [rootfs_name]
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# figure out how big of a boot partition we need
-boot_size=$(du -ms /run/media/$1/ | awk '{print $1}')
-# remove rootfs.img ($2) from the size if it exists, as its not installed to /boot
-if [ -e /run/media/$1/$2 ]; then
- boot_size=$(( boot_size - $( du -ms /run/media/$1/$2 | awk '{print $1}') ))
-fi
-# remove initrd from size since its not currently installed
-if [ -e /run/media/$1/initrd ]; then
- boot_size=$(( boot_size - $( du -ms /run/media/$1/initrd | awk '{print $1}') ))
-fi
-# add 10M to provide some extra space for users and account
-# for rounding in the above subtractions
-boot_size=$(( boot_size + 10 ))
-
-# 5% for swap
-swap_ratio=5
-
-# Get a list of hard drives
-hdnamelist=""
-live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'`
-live_dev_name=${live_dev_name#\/dev/}
-# Only strip the digit identifier if the device is not an mmc
-case $live_dev_name in
- mmcblk*)
- ;;
- nvme*)
- ;;
- *)
- live_dev_name=${live_dev_name%%[0-9]*}
- ;;
-esac
-
-echo "Searching for hard drives ..."
-
-# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
-# we're currently only interested in the root device so pick them wisely
-devices=`ls /sys/block/ | grep -v "mmcblk\|md\|dm"` || true
-mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
-md_devices=`cat /proc/mdstat |grep -w active |awk -F":" '{print $1}'` || true
-devices="$devices $mmc_devices $md_devices"
-
-for device in $devices; do
- case $device in
- loop*)
- # skip loop device
- ;;
- sr*)
- # skip CDROM device
- ;;
- ram*)
- # skip ram device
- ;;
- *)
- # skip the device LiveOS is on
- # Add valid hard drive name to the list
- case $device in
- $live_dev_name*)
- # skip the device we are running from
- ;;
- *)
- hdnamelist="$hdnamelist $device"
- ;;
- esac
- ;;
- esac
-done
-
-if [ -z "${hdnamelist}" ]; then
- echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted."
- exit 1
-fi
-
-TARGET_DEVICE_NAME=""
-for hdname in $hdnamelist; do
- # Display found hard drives and their basic info
- echo "-------------------------------"
- echo /dev/$hdname
- if [ -r /sys/block/$hdname/device/vendor ]; then
- echo -n "VENDOR="
- cat /sys/block/$hdname/device/vendor
- fi
- if [ -r /sys/block/$hdname/device/model ]; then
- echo -n "MODEL="
- cat /sys/block/$hdname/device/model
- fi
- if [ -r /sys/block/$hdname/device/uevent ]; then
- echo -n "UEVENT="
- cat /sys/block/$hdname/device/uevent
- fi
- echo
-done
-
-# Get user choice
-while true; do
- echo "Please select an install target or press n to exit ($hdnamelist ): "
- read answer
- if [ "$answer" = "n" ]; then
- echo "Installation manually aborted."
- exit 1
- fi
- for hdname in $hdnamelist; do
- if [ "$answer" = "$hdname" ]; then
- TARGET_DEVICE_NAME=$answer
- break
- fi
- done
- if [ -n "$TARGET_DEVICE_NAME" ]; then
- break
- fi
-done
-
-if [ -n "$TARGET_DEVICE_NAME" ]; then
- echo "Installing image on /dev/$TARGET_DEVICE_NAME ..."
-else
- echo "No hard drive selected. Installation aborted."
- exit 1
-fi
-
-device=/dev/$TARGET_DEVICE_NAME
-
-#
-# The udev automounter can cause pain here, kill it
-#
-#rm -f /etc/udev/rules.d/automount.rules
-#rm -f /etc/udev/scripts/mount*
-
-#
-# Unmount anything the automounter had mounted
-#
-#umount ${device}* 2> /dev/null || /bin/true
-
-for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts | grep $TARGET_DEVICE_NAME`; do
- umount $dir
-done
-
-mkdir -p /tmp
-
-# Create /etc/mtab if not present
-if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then
- ln -sf /proc/mounts /etc/mtab
-fi
-
-disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
-
-swap_size=$((disk_size*swap_ratio/100))
-rootfs_size=$((disk_size-boot_size-swap_size))
-
-rootfs_start=$((boot_size))
-rootfs_end=$((rootfs_start+rootfs_size))
-swap_start=$((rootfs_end))
-
-# MMC devices are special in a couple of ways
-# 1) they use a partition prefix character 'p'
-# 2) they are detected asynchronously (need rootwait)
-rootwait=""
-part_prefix=""
-if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
- [ ! "${device#/dev/nvme}" = "${device}" ]; then
- part_prefix="p"
- rootwait="rootwait"
-fi
-
-# MD raid device use partition prefix charater 'p'
-# and it need a larger capacity to store initrd,
-# considering some debug purpose, enlarge it to 1G.
-if [ ! "${device#/dev/md}" = "${device}" ]; then
- part_prefix="p"
- boot_size=1024
-fi
-
-# USB devices also require rootwait
-if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
- rootwait="rootwait"
-fi
-
-bootfs=${device}${part_prefix}1
-rootfs=${device}${part_prefix}2
-swap=${device}${part_prefix}3
-
-echo "*****************"
-echo "Boot partition size: $boot_size MB ($bootfs)"
-echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
-echo "Swap partition size: $swap_size MB ($swap)"
-echo "*****************"
-echo "Deleting partition table on ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=35
-
-echo "Creating new partition table on ${device} ..."
-parted ${device} mklabel gpt
-
-echo "Creating boot partition on $bootfs"
-parted ${device} mkpart boot fat32 0% $boot_size
-parted ${device} set 1 boot on
-
-echo "Creating rootfs partition on $rootfs"
-parted ${device} mkpart root ext4 $rootfs_start $rootfs_end
-
-echo "Creating swap partition on $swap"
-parted ${device} mkpart swap linux-swap $swap_start 100%
-
-parted ${device} print
-
-echo "Waiting for device nodes..."
-C=0
-while [ $C -ne 3 ] && [ ! -e $bootfs -o ! -e $rootfs -o ! -e $swap ]; do
- C=$(( C + 1 ))
- sleep 1
-done
-
-echo "Formatting $bootfs to vfat..."
-mkfs.vfat $bootfs
-
-echo "Formatting $rootfs to ext4..."
-mkfs.ext4 $rootfs
-
-echo "Formatting swap partition...($swap)"
-mkswap $swap
-
-mkdir /tgt_root
-mkdir /src_root
-mkdir -p /boot
-
-# Handling of the target root partition
-mount $rootfs /tgt_root
-
-if [ ! -f /run/media/$1/$2 ]; then
- mkdir -p /run/media/$1
- mount /dev/$1 /run/media/$1
-fi
-mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
-echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
-if [ -d /tgt_root/etc/ ] ; then
- boot_uuid=$(blkid -o value -s UUID ${bootfs})
- swap_part_uuid=$(blkid -o value -s PARTUUID ${swap})
- echo "/dev/disk/by-partuuid/$swap_part_uuid swap swap defaults 0 0" >> /tgt_root/etc/fstab
- echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab
- # We dont want udev to mount our root device while we're booting...
- if [ -d /tgt_root/etc/udev/ ] ; then
- echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
- fi
-fi
-
-umount /src_root
-
-# Handling of the target boot partition
-mount $bootfs /boot
-echo "Preparing boot partition..."
-
-EFIDIR="/boot/EFI/BOOT"
-mkdir -p $EFIDIR
-# Copy the efi loader
-cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
-
-if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
- root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
- GRUBCFG="$EFIDIR/grub.cfg"
- cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
- # Update grub config for the installed image
- # Delete the install entry
- sed -i "/menuentry 'install/,/^}/d" $GRUBCFG
- # initrd is necessary to boot from MD device
- if [ ! "${device#/dev/md}" = "${device}" ]; then
- cp /run/media/$1/initrd /boot
- cp /run/media/$1/startup.nsh /boot
- else
- # Delete the initrd lines
- sed -i "/initrd /d" $GRUBCFG
- fi
- # Delete any LABEL= strings
- sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
- # Replace root= and add additional standard boot options
- # We use root as a sentinel value, as vmlinuz is no longer guaranteed
- sed -i "s/ root=[^ ]*/ root=PARTUUID=$root_part_uuid rw $rootwait quiet /g" $GRUBCFG
-fi
-
-if [ -d /run/media/$1/loader ]; then
- rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
- SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf"
- # copy config files for systemd-boot
- cp -dr /run/media/$1/loader /boot
- # delete the install entry
- rm -f /boot/loader/entries/install.conf
- # delete the initrd lines
- sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
- # delete any LABEL= strings
- sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
- # delete any root= strings
- sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
- # add the root= and other standard boot options
- sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $SYSTEMDBOOT_CFGS
-fi
-
-umount /tgt_root
-
-# Copy kernel artifacts. To add more artifacts just add to types
-# For now just support kernel types already being used by something in OE-core
-for types in bzImage zImage vmlinux vmlinuz fitImage; do
- for kernel in `find /run/media/$1/ -name $types*`; do
- cp $kernel /boot
- done
-done
-
-umount /boot
-
-sync
-
-echo "Installation successful. Remove your installation media and press ENTER to reboot."
-
-read enter
-
-echo "Rebooting..."
-reboot -f
diff --git a/meta-oran/recipes-core/initrdscripts/files/init-install.sh b/meta-oran/recipes-core/initrdscripts/files/init-install.sh
deleted file mode 100644
index 9eae75f..0000000
--- a/meta-oran/recipes-core/initrdscripts/files/init-install.sh
+++ /dev/null
@@ -1,353 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (C) 2008-2011 Intel
-#
-# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
-#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# figure out how big of a boot partition we need
-boot_size=$(du -ms /run/media/$1/ | awk '{print $1}')
-# remove rootfs.img ($2) from the size if it exists, as its not installed to /boot
-if [ -e /run/media/$1/$2 ]; then
- boot_size=$(( boot_size - $( du -ms /run/media/$1/$2 | awk '{print $1}') ))
-fi
-# remove initrd from size since its not currently installed
-if [ -e /run/media/$1/initrd ]; then
- boot_size=$(( boot_size - $( du -ms /run/media/$1/initrd | awk '{print $1}') ))
-fi
-# add 10M to provide some extra space for users and account
-# for rounding in the above subtractions
-boot_size=$(( boot_size + 10 ))
-
-# 5% for the swap
-swap_ratio=5
-
-# Get a list of hard drives
-hdnamelist=""
-live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'`
-live_dev_name=${live_dev_name#\/dev/}
-# Only strip the digit identifier if the device is not an mmc
-case $live_dev_name in
- mmcblk*)
- ;;
- nvme*)
- ;;
- *)
- live_dev_name=${live_dev_name%%[0-9]*}
- ;;
-esac
-
-echo "Searching for hard drives ..."
-
-# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
-# we're currently only interested in the root device so pick them wisely
-devices=`ls /sys/block/ | grep -v mmcblk` || true
-mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
-devices="$devices $mmc_devices"
-
-for device in $devices; do
- case $device in
- loop*)
- # skip loop device
- ;;
- sr*)
- # skip CDROM device
- ;;
- ram*)
- # skip ram device
- ;;
- *)
- # skip the device LiveOS is on
- # Add valid hard drive name to the list
- case $device in
- $live_dev_name*)
- # skip the device we are running from
- ;;
- *)
- hdnamelist="$hdnamelist $device"
- ;;
- esac
- ;;
- esac
-done
-
-TARGET_DEVICE_NAME=""
-for hdname in $hdnamelist; do
- # Display found hard drives and their basic info
- echo "-------------------------------"
- echo /dev/$hdname
- if [ -r /sys/block/$hdname/device/vendor ]; then
- echo -n "VENDOR="
- cat /sys/block/$hdname/device/vendor
- fi
- if [ -r /sys/block/$hdname/device/model ]; then
- echo -n "MODEL="
- cat /sys/block/$hdname/device/model
- fi
- if [ -r /sys/block/$hdname/device/uevent ]; then
- echo -n "UEVENT="
- cat /sys/block/$hdname/device/uevent
- fi
- echo
-done
-
-# Get user choice
-while true; do
- echo "Please select an install target or press n to exit ($hdnamelist ): "
- read answer
- if [ "$answer" = "n" ]; then
- echo "Installation manually aborted."
- exit 1
- fi
- for hdname in $hdnamelist; do
- if [ "$answer" = "$hdname" ]; then
- TARGET_DEVICE_NAME=$answer
- break
- fi
- done
- if [ -n "$TARGET_DEVICE_NAME" ]; then
- break
- fi
-done
-
-if [ -n "$TARGET_DEVICE_NAME" ]; then
- echo "Installing image on /dev/$TARGET_DEVICE_NAME ..."
-else
- echo "No hard drive selected. Installation aborted."
- exit 1
-fi
-
-device=/dev/$TARGET_DEVICE_NAME
-
-#
-# The udev automounter can cause pain here, kill it
-#
-#rm -f /etc/udev/rules.d/automount.rules
-#rm -f /etc/udev/scripts/mount*
-
-#
-# Unmount anything the automounter had mounted
-#
-#umount ${device}* 2> /dev/null || /bin/true
-
-for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts | grep $TARGET_DEVICE_NAME`; do
- umount $dir
-done
-
-if [ ! -b /dev/loop0 ] ; then
- mknod /dev/loop0 b 7 0
-fi
-
-mkdir -p /tmp
-if [ ! -L /etc/mtab ] && [ -e /proc/mounts ]; then
- ln -sf /proc/mounts /etc/mtab
-fi
-
-disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//")
-
-grub_version=$(grub-install -V|sed 's/.* \([0-9]\).*/\1/')
-
-if [ $grub_version -eq 0 ] ; then
- bios_boot_size=0
-else
- # For GRUB 2 we need separate parition to store stage2 grub image
- # 2Mb value is chosen to align partition for best performance.
- bios_boot_size=2
-fi
-
-swap_size=$((disk_size*swap_ratio/100))
-rootfs_size=$((disk_size-bios_boot_size-boot_size-swap_size))
-
-boot_start=$((bios_boot_size))
-rootfs_start=$((bios_boot_size+boot_size))
-rootfs_end=$((rootfs_start+rootfs_size))
-swap_start=$((rootfs_end))
-
-# MMC devices are special in a couple of ways
-# 1) they use a partition prefix character 'p'
-# 2) they are detected asynchronously (need rootwait)
-rootwait=""
-part_prefix=""
-if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
- [ ! "${device#/dev/nvme}" = "${device}" ]; then
- part_prefix="p"
- rootwait="rootwait"
-fi
-
-# USB devices also require rootwait
-if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
- rootwait="rootwait"
-fi
-
-if [ $grub_version -eq 0 ] ; then
- bios_boot=''
- bootfs=${device}${part_prefix}1
- rootfs=${device}${part_prefix}2
- swap=${device}${part_prefix}3
-else
- bios_boot=${device}${part_prefix}1
- bootfs=${device}${part_prefix}2
- rootfs=${device}${part_prefix}3
- swap=${device}${part_prefix}4
-fi
-
-echo "*****************"
-[ $grub_version -ne 0 ] && echo "BIOS boot partition size: $bios_boot_size MB ($bios_boot)"
-echo "Boot partition size: $boot_size MB ($bootfs)"
-echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
-echo "Swap partition size: $swap_size MB ($swap)"
-echo "*****************"
-echo "Deleting partition table on ${device} ..."
-dd if=/dev/zero of=${device} bs=512 count=35
-
-echo "Creating new partition table on ${device} ..."
-if [ $grub_version -eq 0 ] ; then
- parted ${device} mktable msdos
- echo "Creating boot partition on $bootfs"
- parted ${device} mkpart primary ext3 0% $boot_size
-else
- parted ${device} mktable gpt
- echo "Creating BIOS boot partition on $bios_boot"
- parted ${device} mkpart bios_boot 0% $bios_boot_size
- parted ${device} set 1 bios_grub on
- echo "Creating boot partition on $bootfs"
- parted ${device} mkpart boot ext3 $boot_start $boot_size
-fi
-
-echo "Creating rootfs partition on $rootfs"
-[ $grub_version -eq 0 ] && pname='primary' || pname='root'
-parted ${device} mkpart $pname ext4 $rootfs_start $rootfs_end
-
-echo "Creating swap partition on $swap"
-[ $grub_version -eq 0 ] && pname='primary' || pname='swap'
-parted ${device} mkpart $pname linux-swap $swap_start 100%
-
-parted ${device} print
-
-echo "Waiting for device nodes..."
-C=0
-while [ $C -ne 3 ] && [ ! -e $bootfs -o ! -e $rootfs -o ! -e $swap ]; do
- C=$(( C + 1 ))
- sleep 1
-done
-
-echo "Formatting $bootfs to ext3..."
-mkfs.ext3 $bootfs
-
-echo "Formatting $rootfs to ext4..."
-mkfs.ext4 $rootfs
-
-echo "Formatting swap partition...($swap)"
-mkswap $swap
-
-mkdir /tgt_root
-mkdir /src_root
-mkdir -p /boot
-
-# Handling of the target root partition
-mount $rootfs /tgt_root
-
-if [ ! -f /run/media/$1/$2 ]; then
- mkdir -p /run/media/$1
- mount /dev/$1 /run/media/$1
-fi
-mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
-
-echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
-if [ -d /tgt_root/etc/ ] ; then
- if [ $grub_version -ne 0 ] ; then
- boot_uuid=$(blkid -o value -s UUID ${bootfs})
- swap_part_uuid=$(blkid -o value -s PARTUUID ${swap})
- bootdev="UUID=$boot_uuid"
- swapdev=/dev/disk/by-partuuid/$swap_part_uuid
- else
- bootdev=${bootfs}
- swapdev=${swap}
- fi
- echo "$swapdev swap swap defaults 0 0" >> /tgt_root/etc/fstab
- echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
- # We dont want udev to mount our root device while we're booting...
- if [ -d /tgt_root/etc/udev/ ] ; then
- echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
- fi
-fi
-umount /tgt_root
-umount /src_root
-
-echo "Looking for kernels to use as boot target.."
-# Find kernel to boot to
-# Give user options if multiple are found
-kernels="$(find /run/media/$1/ -type f \
- -name bzImage* -o -name zImage* \
- -o -name vmlinux* -o -name vmlinuz* \
- -o -name fitImage* \
- | sed s:.*/::)"
-if [ -n "$(echo $kernels)" ]; then
- # only one kernel entry if no space
- if [ -z "$(echo $kernels | grep " ")" ]; then
- kernel=$kernels
- echo "$kernel will be used as the boot target"
- else
- echo "Which kernel do we want to boot by default? The following kernels were found:"
- echo $kernels
- read answer
- kernel=$answer
- fi
-else
- echo "No kernels found, exiting..."
- exit 1
-fi
-
-# Handling of the target boot partition
-mount $bootfs /boot
-echo "Preparing boot partition..."
-
-if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then
- echo "Preparing custom grub2 menu..."
- root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
- boot_uuid=$(blkid -o value -s UUID ${bootfs})
- GRUBCFG="/boot/grub/grub.cfg"
- mkdir -p $(dirname $GRUBCFG)
- cat >$GRUBCFG <<_EOF
-timeout=5
-default=0
-menuentry "Linux" {
- search --no-floppy --fs-uuid $boot_uuid --set root
- linux /$kernel root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet
-}
-_EOF
- chmod 0444 $GRUBCFG
-fi
-grub-install ${device}
-
-if [ $grub_version -eq 0 ] ; then
- echo "(hd0) ${device}" > /boot/grub/device.map
- echo "Preparing custom grub menu..."
- echo "default 0" > /boot/grub/menu.lst
- echo "timeout 30" >> /boot/grub/menu.lst
- echo "title Live Boot/Install-Image" >> /boot/grub/menu.lst
- echo "root (hd0,0)" >> /boot/grub/menu.lst
- echo "kernel /$kernel root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst
-fi
-
-# Copy kernel artifacts. To add more artifacts just add to types
-# For now just support kernel types already being used by something in OE-core
-for types in bzImage zImage vmlinux vmlinuz fitImage; do
- for kernel in `find /run/media/$1/ -name $types*`; do
- cp $kernel /boot
- done
-done
-
-umount /boot
-
-sync
-
-echo "Remove your installation media, and press ENTER"
-
-read enter
-
-echo "Rebooting..."
-reboot -f
diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend
deleted file mode 100644
index a5250da..0000000
--- a/meta-oran/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
deleted file mode 100644
index a5250da..0000000
--- a/meta-oran/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend
deleted file mode 100644
index a5250da..0000000
--- a/meta-oran/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-install_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-module-install_1.0.bbappend
deleted file mode 100644
index a5250da..0000000
--- a/meta-oran/recipes-core/initrdscripts/initramfs-module-install_1.0.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live/setup-live b/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live/setup-live
deleted file mode 100644
index 66ff6ac..0000000
--- a/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live/setup-live
+++ /dev/null
@@ -1,75 +0,0 @@
-#/bin/sh
-# Copyright (C) 2011 O.S. Systems Software LTDA.
-# Licensed on MIT
-
-_UDEV_DAEMON=`udev_daemon`
-
-setup_enabled() {
- return 0
-}
-
-setup_run() {
-ROOT_IMAGE="rootfs.img"
-ISOLINUX=""
-ROOT_DISK=""
-shelltimeout=60
-
- if [ -z "$bootparam_root" -o "$bootparam_root" = "/dev/ram0" ]; then
- echo "Waiting for removable media..."
- udevadm trigger --action=add
- udevadm settle
- echo "Mounted filesystems"
- mount |grep media
- C=0
- while true
- do
- for i in `ls /run/media 2>/dev/null`; do
- if [ -f /run/media/$i/$ROOT_IMAGE ] ; then
- found="yes"
- ROOT_DISK="$i"
- break
- elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then
- found="yes"
- ISOLINUX="isolinux"
- ROOT_DISK="$i"
- break
- fi
- done
- if [ "$found" = "yes" ]; then
- break;
- fi
- # don't wait for more than $shelltimeout seconds, if it's set
- if [ -n "$shelltimeout" ]; then
- echo " " $(( $shelltimeout - $C ))
- if [ $C -ge $shelltimeout ]; then
- echo "..."
- echo "Mounted filesystems"
- mount | grep media
- echo "Available block devices"
- cat /proc/partitions
- fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell "
- fi
- udevadm trigger --action=add
- udevadm settle
- echo "Mounted filesystems"
- mount |grep media
- C=$(( C + 1 ))
- fi
- sleep 1
- done
- killall -9 "${_UDEV_DAEMON##*/}" 2>/dev/null
- # The existing rootfs module has no support for rootfs images. Assign the rootfs image.
- bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE"
- fi
-
- if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then
- if [ -f /run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE ] ; then
- ./init.d/$bootparam_LABEL.sh $ROOT_DISK/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params
- else
- fatal "Could not find $bootparam_LABEL script"
- fi
-
- # If we're getting here, we failed...
- fatal "Target $bootparam_LABEL failed"
- fi
-}
diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bbappend
deleted file mode 100644
index c16457c..0000000
--- a/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-module-setup-live:"
diff --git a/meta-oran/recipes-devtools/go/go-1.12.inc b/meta-oran/recipes-devtools/go/go-1.12.inc
deleted file mode 100644
index e5ab7fc..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2019 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 recipes-devtools/go/go-common.inc
-
-GO_BASEVERSION = "1.12"
-GO_MINOR = ".6"
-PV .= "${GO_MINOR}"
-FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
-
-SRC_URI += "\
- file://0001-allow-CC-and-CXX-to-have-multiple-words.patch \
- file://0002-cmd-go-make-content-based-hash-generation-less-pedan.patch \
- file://0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch \
- file://0004-ld-add-soname-to-shareable-objects.patch \
- file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \
- file://0006-cmd-dist-separate-host-and-target-builds.patch \
- file://0007-cmd-go-make-GOROOT-precious-by-default.patch \
- file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
-"
-SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
-
-SRC_URI[main.md5sum] = "48a4141fc718dd742d106431294f08bf"
-SRC_URI[main.sha256sum] = "c96c5ccc7455638ae1a8b7498a030fe653731c8391c5f8e79590bce72f92b4ca"
-
-do_compile_prepend() {
- unset GOCACHE
-}
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/meta-oran/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch
deleted file mode 100644
index 4442858..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0001-allow-CC-and-CXX-to-have-multiple-words.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7cc519aa5f84cf8fc7ac8c10fc69aa8040330ea0 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Mon, 19 Feb 2018 08:49:33 -0800
-Subject: [PATCH] allow CC and CXX to have multiple words
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/cmd/go/internal/envcmd/env.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
-index afadbad..cedbfbf 100644
---- a/src/cmd/go/internal/envcmd/env.go
-+++ b/src/cmd/go/internal/envcmd/env.go
-@@ -85,11 +85,11 @@ func MkEnv() []cfg.EnvVar {
-
- cc := cfg.DefaultCC(cfg.Goos, cfg.Goarch)
- if env := strings.Fields(os.Getenv("CC")); len(env) > 0 {
-- cc = env[0]
-+ cc = strings.Join(env, " ")
- }
- cxx := cfg.DefaultCXX(cfg.Goos, cfg.Goarch)
- if env := strings.Fields(os.Getenv("CXX")); len(env) > 0 {
-- cxx = env[0]
-+ cxx = strings.Join(env, " ")
- }
- env = append(env, cfg.EnvVar{Name: "CC", Value: cc})
- env = append(env, cfg.EnvVar{Name: "CXX", Value: cxx})
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/meta-oran/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
deleted file mode 100644
index 66b8561..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 47db69e20ed66fb62b01affd83d829654b829893 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Mon, 19 Feb 2018 08:50:59 -0800
-Subject: [PATCH] cmd/go: make content-based hash generation less pedantic
-
-Go 1.10's build tool now uses content-based hashes to
-determine when something should be built or re-built.
-This same mechanism is used to maintain a built-artifact
-cache for speeding up builds.
-
-However, the hashes it generates include information that
-doesn't work well with OE, nor with using a shared runtime
-library.
-
-First, it embeds path names to source files, unless
-building within GOROOT. This prevents the building
-of a package in GOPATH for later staging into GOROOT.
-
-This patch adds support for the environment variable
-GOPATH_OMIT_IN_ACTIONID. If present, path name
-embedding is disabled.
-
-Second, if cgo is enabled, the build ID for cgo-related
-packages will include the current value of the environment
-variables for invoking the compiler (CC, CXX, FC) and
-any CGO_xxFLAGS variables. Only if the settings used
-during a compilation exactly match, character for character,
-the values used for compiling runtime/cgo or any other
-cgo-enabled package being imported, will the tool
-decide that the imported package is up-to-date.
-
-This is done to help ensure correctness, but is overly
-simplistic and effectively prevents the reuse of built
-artifacts that use cgo (or shared runtime, which includes
-runtime/cgo).
-
-This patch filters out all compiler flags except those
-beginning with '-m'. The default behavior can be restored
-by setting the CGO_PEDANTIC environment variable.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/cmd/go/internal/envcmd/env.go | 2 +-
- src/cmd/go/internal/work/exec.go | 63 ++++++++++++++++++++++---------
- 2 files changed, 46 insertions(+), 19 deletions(-)
-
-diff --git a/src/cmd/go/internal/envcmd/env.go b/src/cmd/go/internal/envcmd/env.go
-index cedbfbf..5763a0d 100644
---- a/src/cmd/go/internal/envcmd/env.go
-+++ b/src/cmd/go/internal/envcmd/env.go
-@@ -128,7 +128,7 @@ func ExtraEnvVars() []cfg.EnvVar {
- func ExtraEnvVarsCostly() []cfg.EnvVar {
- var b work.Builder
- b.Init()
-- cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{})
-+ cppflags, cflags, cxxflags, fflags, ldflags, err := b.CFlags(&load.Package{}, false)
- if err != nil {
- // Should not happen - b.CFlags was given an empty package.
- fmt.Fprintf(os.Stderr, "go: invalid cflags: %v\n", err)
-diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go
-index 12e1527..e41bfac 100644
---- a/src/cmd/go/internal/work/exec.go
-+++ b/src/cmd/go/internal/work/exec.go
-@@ -174,6 +174,8 @@ func (b *Builder) Do(root *Action) {
- wg.Wait()
- }
-
-+var omitGopath = os.Getenv("GOPATH_OMIT_IN_ACTIONID") != ""
-+
- // buildActionID computes the action ID for a build action.
- func (b *Builder) buildActionID(a *Action) cache.ActionID {
- p := a.Package
-@@ -190,7 +192,7 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {
- // but it does not hide the exact value of $GOPATH.
- // Include the full dir in that case.
- // Assume b.WorkDir is being trimmed properly.
-- if !p.Goroot && !strings.HasPrefix(p.Dir, b.WorkDir) {
-+ if !p.Goroot && !omitGopath && !strings.HasPrefix(p.Dir, b.WorkDir) {
- fmt.Fprintf(h, "dir %s\n", p.Dir)
- }
- fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch)
-@@ -201,13 +203,13 @@ func (b *Builder) buildActionID(a *Action) cache.ActionID {
- }
- if len(p.CgoFiles)+len(p.SwigFiles) > 0 {
- fmt.Fprintf(h, "cgo %q\n", b.toolID("cgo"))
-- cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p)
-- fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(), cppflags, cflags, ldflags)
-+ cppflags, cflags, cxxflags, fflags, ldflags, _ := b.CFlags(p, true)
-+ fmt.Fprintf(h, "CC=%q %q %q %q\n", b.ccExe(true), cppflags, cflags, ldflags)
- if len(p.CXXFiles)+len(p.SwigFiles) > 0 {
-- fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(), cxxflags)
-+ fmt.Fprintf(h, "CXX=%q %q\n", b.cxxExe(true), cxxflags)
- }
- if len(p.FFiles) > 0 {
-- fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(), fflags)
-+ fmt.Fprintf(h, "FC=%q %q\n", b.fcExe(true), fflags)
- }
- // TODO(rsc): Should we include the SWIG version or Fortran/GCC/G++/Objective-C compiler versions?
- }
-@@ -2096,33 +2098,33 @@ var (
- // gccCmd returns a gcc command line prefix
- // defaultCC is defined in zdefaultcc.go, written by cmd/dist.
- func (b *Builder) GccCmd(incdir, workdir string) []string {
-- return b.compilerCmd(b.ccExe(), incdir, workdir)
-+ return b.compilerCmd(b.ccExe(false), incdir, workdir)
- }
-
- // gxxCmd returns a g++ command line prefix
- // defaultCXX is defined in zdefaultcc.go, written by cmd/dist.
- func (b *Builder) GxxCmd(incdir, workdir string) []string {
-- return b.compilerCmd(b.cxxExe(), incdir, workdir)
-+ return b.compilerCmd(b.cxxExe(false), incdir, workdir)
- }
-
- // gfortranCmd returns a gfortran command line prefix.
- func (b *Builder) gfortranCmd(incdir, workdir string) []string {
-- return b.compilerCmd(b.fcExe(), incdir, workdir)
-+ return b.compilerCmd(b.fcExe(false), incdir, workdir)
- }
-
- // ccExe returns the CC compiler setting without all the extra flags we add implicitly.
--func (b *Builder) ccExe() []string {
-- return b.compilerExe(origCC, cfg.DefaultCC(cfg.Goos, cfg.Goarch))
-+func (b *Builder) ccExe(filtered bool) []string {
-+ return b.compilerExe(origCC, cfg.DefaultCC(cfg.Goos, cfg.Goarch), filtered)
- }
-
- // cxxExe returns the CXX compiler setting without all the extra flags we add implicitly.
--func (b *Builder) cxxExe() []string {
-- return b.compilerExe(origCXX, cfg.DefaultCXX(cfg.Goos, cfg.Goarch))
-+func (b *Builder) cxxExe(filtered bool) []string {
-+ return b.compilerExe(origCXX, cfg.DefaultCXX(cfg.Goos, cfg.Goarch), filtered)
- }
-
- // fcExe returns the FC compiler setting without all the extra flags we add implicitly.
--func (b *Builder) fcExe() []string {
-- return b.compilerExe(os.Getenv("FC"), "gfortran")
-+func (b *Builder) fcExe(filtered bool) []string {
-+ return b.compilerExe(os.Getenv("FC"), "gfortran", filtered)
- }
-
- // compilerExe returns the compiler to use given an
-@@ -2131,11 +2133,14 @@ func (b *Builder) fcExe() []string {
- // of the compiler but can have additional arguments if they
- // were present in the environment value.
- // For example if CC="gcc -DGOPHER" then the result is ["gcc", "-DGOPHER"].
--func (b *Builder) compilerExe(envValue string, def string) []string {
-+func (b *Builder) compilerExe(envValue string, def string, filtered bool) []string {
- compiler := strings.Fields(envValue)
- if len(compiler) == 0 {
- compiler = []string{def}
- }
-+ if filtered {
-+ return append(compiler[0:1], filterCompilerFlags(compiler[1:])...)
-+ }
- return compiler
- }
-
-@@ -2285,8 +2290,23 @@ func envList(key, def string) []string {
- return strings.Fields(v)
- }
-
-+var filterFlags = os.Getenv("CGO_PEDANTIC") == ""
-+
-+func filterCompilerFlags(flags []string) []string {
-+ var newflags []string
-+ if !filterFlags {
-+ return flags
-+ }
-+ for _, flag := range flags {
-+ if strings.HasPrefix(flag, "-m") {
-+ newflags = append(newflags, flag)
-+ }
-+ }
-+ return newflags
-+}
-+
- // CFlags returns the flags to use when invoking the C, C++ or Fortran compilers, or cgo.
--func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) {
-+func (b *Builder) CFlags(p *load.Package, filtered bool) (cppflags, cflags, cxxflags, fflags, ldflags []string, err error) {
- defaults := "-g -O2"
-
- if cppflags, err = buildFlags("CPPFLAGS", "", p.CgoCPPFLAGS, checkCompilerFlags); err != nil {
-@@ -2304,6 +2324,13 @@ func (b *Builder) CFlags(p *load.Package) (cppflags, cflags, cxxflags, fflags, l
- if ldflags, err = buildFlags("LDFLAGS", defaults, p.CgoLDFLAGS, checkLinkerFlags); err != nil {
- return
- }
-+ if filtered {
-+ cppflags = filterCompilerFlags(cppflags)
-+ cflags = filterCompilerFlags(cflags)
-+ cxxflags = filterCompilerFlags(cxxflags)
-+ fflags = filterCompilerFlags(fflags)
-+ ldflags = filterCompilerFlags(ldflags)
-+ }
-
- return
- }
-@@ -2319,7 +2346,7 @@ var cgoRe = regexp.MustCompile(`[/\\:]`)
-
- func (b *Builder) cgo(a *Action, cgoExe, objdir string, pcCFLAGS, pcLDFLAGS, cgofiles, gccfiles, gxxfiles, mfiles, ffiles []string) (outGo, outObj []string, err error) {
- p := a.Package
-- cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p)
-+ cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, cgoFFLAGS, cgoLDFLAGS, err := b.CFlags(p, false)
- if err != nil {
- return nil, nil, err
- }
-@@ -2679,7 +2706,7 @@ func (b *Builder) swigIntSize(objdir string) (intsize string, err error) {
-
- // Run SWIG on one SWIG input file.
- func (b *Builder) swigOne(a *Action, p *load.Package, file, objdir string, pcCFLAGS []string, cxx bool, intgosize string) (outGo, outC string, err error) {
-- cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p)
-+ cgoCPPFLAGS, cgoCFLAGS, cgoCXXFLAGS, _, _, err := b.CFlags(p, false)
- if err != nil {
- return "", "", err
- }
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/meta-oran/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
deleted file mode 100644
index b6ca40e..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5c32c38bf19b24f0aadd78012d17ff5caa82151e Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Sat, 17 Feb 2018 05:24:20 -0800
-Subject: [PATCH] allow GOTOOLDIR to be overridden in the environment
-
-to allow for split host/target build roots
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/cmd/dist/build.go | 4 +++-
- src/cmd/go/internal/cfg/cfg.go | 7 +++++--
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: go/src/cmd/dist/build.go
-===================================================================
---- go.orig/src/cmd/dist/build.go
-+++ go/src/cmd/dist/build.go
-@@ -228,7 +228,9 @@ func xinit() {
- workdir = xworkdir()
- xatexit(rmworkdir)
-
-- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
-+ if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {
-+ tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
-+ }
- }
-
- // compilerEnv returns a map from "goos/goarch" to the
-Index: go/src/cmd/go/internal/cfg/cfg.go
-===================================================================
---- go.orig/src/cmd/go/internal/cfg/cfg.go
-+++ go/src/cmd/go/internal/cfg/cfg.go
-@@ -116,7 +116,11 @@ func init() {
- // variables. This matches the initialization of ToolDir in
- // go/build, except for using GOROOT rather than
- // runtime.GOROOT.
-- build.ToolDir = filepath.Join(GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
-+ if s := os.Getenv("GOTOOLDIR"); s != "" {
-+ build.ToolDir = filepath.Clean(s)
-+ } else {
-+ build.ToolDir = filepath.Join(GOROOT, "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
-+ }
- }
- }
-
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch b/meta-oran/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch
deleted file mode 100644
index 004a33a..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0004-ld-add-soname-to-shareable-objects.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 55eb8c95a89f32aec16b7764e78e8cf75169dc81 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Sat, 17 Feb 2018 06:26:10 -0800
-Subject: [PATCH] ld: add soname to shareable objects
-
-so that OE's shared library dependency handling
-can find them.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/cmd/link/internal/ld/lib.go | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
-index 220aab3..703925f 100644
---- a/src/cmd/link/internal/ld/lib.go
-+++ b/src/cmd/link/internal/ld/lib.go
-@@ -1135,6 +1135,7 @@ func (ctxt *Link) hostlink() {
- argv = append(argv, "-Wl,-z,relro")
- }
- argv = append(argv, "-shared")
-+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))
- if ctxt.HeadType != objabi.Hwindows {
- // Pass -z nodelete to mark the shared library as
- // non-closeable: a dlclose will do nothing.
-@@ -1146,6 +1147,8 @@ func (ctxt *Link) hostlink() {
- argv = append(argv, "-Wl,-z,relro")
- }
- argv = append(argv, "-shared")
-+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))
-+
- case BuildModePlugin:
- if ctxt.HeadType == objabi.Hdarwin {
- argv = append(argv, "-dynamiclib")
-@@ -1154,6 +1157,7 @@ func (ctxt *Link) hostlink() {
- argv = append(argv, "-Wl,-z,relro")
- }
- argv = append(argv, "-shared")
-+ argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile)))
- }
- }
-
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/meta-oran/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
deleted file mode 100644
index ace8de9..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1bf15aa8fb773604b2524cfdab493fa4d8fa9285 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Sat, 17 Feb 2018 06:32:45 -0800
-Subject: [PATCH] make.bash: override CC when building dist and go_bootstrap
-
-for handling OE cross-canadian builds.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/make.bash | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/make.bash b/src/make.bash
-index 78882d9..25943d0 100755
---- a/src/make.bash
-+++ b/src/make.bash
-@@ -163,7 +163,7 @@ if [ "$GOROOT_BOOTSTRAP" = "$GOROOT" ]; then
- exit 1
- fi
- rm -f cmd/dist/dist
--GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
-+CC="${BUILD_CC:-${CC}}" GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist
-
- # -e doesn't propagate out of eval, so check success by hand.
- eval $(./cmd/dist/dist env -p || echo FAIL=true)
-@@ -194,7 +194,7 @@ fi
- # Run dist bootstrap to complete make.bash.
- # Bootstrap installs a proper cmd/dist, built with the new toolchain.
- # Throw ours, built with Go 1.4, away after bootstrap.
--./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"
-+CC="${BUILD_CC:-${CC}}" ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@"
- rm -f ./cmd/dist/dist
-
- # DO NOT ADD ANY NEW CODE HERE.
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch b/meta-oran/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch
deleted file mode 100644
index 0c0d5da..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0006-cmd-dist-separate-host-and-target-builds.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From fe0fcaf43ef3aab81541dad2a71b46254dc4cf6a Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Sat, 17 Feb 2018 10:03:48 -0800
-Subject: [PATCH] cmd/dist: separate host and target builds
-
-Change the dist tool to allow for OE-style cross-
-and cross-canadian builds:
-
- - command flags --host-only and --target only are added;
- if one is present, the other changes mentioned below
- take effect, and arguments may also be specified on
- the command line to enumerate the package(s) to be
- built.
-
- - for OE cross builds, go_bootstrap is always built for
- the current build host, and is moved, along with the supporting
- toolchain (asm, compile, etc.) to a separate 'native_native'
- directory under GOROOT/pkg/tool.
-
- - go_bootstrap is not automatically removed after the build,
- so it can be reused later (e.g., building both static and
- shared runtime).
-
-Note that for --host-only builds, it would be nice to specify
-just the "cmd" package to build only the go commands/tools,
-the staleness checks in the dist tool will fail if the "std"
-library has not also been built. So host-only builds have to
-build everything anyway.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
-more dist cleanup
-
----
- src/cmd/dist/build.go | 153 ++++++++++++++++++++++++++++++------------
- 1 file changed, 111 insertions(+), 42 deletions(-)
-
-Index: go/src/cmd/dist/build.go
-===================================================================
---- go.orig/src/cmd/dist/build.go
-+++ go/src/cmd/dist/build.go
-@@ -39,6 +39,7 @@ var (
- goldflags string
- workdir string
- tooldir string
-+ build_tooldir string
- oldgoos string
- oldgoarch string
- exe string
-@@ -50,6 +51,7 @@ var (
-
- rebuildall bool
- defaultclang bool
-+ crossBuild bool
-
- vflag int // verbosity
- )
-@@ -231,6 +233,8 @@ func xinit() {
- if tooldir = os.Getenv("GOTOOLDIR"); tooldir == "" {
- tooldir = pathf("%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch)
- }
-+ build_tooldir = pathf("%s/pkg/tool/native_native", goroot)
-+
- }
-
- // compilerEnv returns a map from "goos/goarch" to the
-@@ -260,7 +264,6 @@ func compilerEnv(envName, def string) ma
- if gohostos != goos || gohostarch != goarch {
- m[gohostos+"/"+gohostarch] = m[""]
- }
-- m[""] = env
- }
-
- for _, goos := range okgoos {
-@@ -487,8 +490,10 @@ func setup() {
- // We keep it in pkg/, just like the object directory above.
- if rebuildall {
- xremoveall(tooldir)
-+ xremoveall(build_tooldir)
- }
- xmkdirall(tooldir)
-+ xmkdirall(build_tooldir)
-
- // Remove tool binaries from before the tool/gohostos_gohostarch
- xremoveall(pathf("%s/bin/tool", goroot))
-@@ -1155,11 +1160,29 @@ func cmdbootstrap() {
-
- var noBanner bool
- var debug bool
-+ var hostOnly bool
-+ var targetOnly bool
-+ var toBuild = []string { "std", "cmd" }
-+
- flag.BoolVar(&rebuildall, "a", rebuildall, "rebuild all")
- flag.BoolVar(&debug, "d", debug, "enable debugging of bootstrap process")
- flag.BoolVar(&noBanner, "no-banner", noBanner, "do not print banner")
-+ flag.BoolVar(&hostOnly, "host-only", hostOnly, "build only host binaries, not target")
-+ flag.BoolVar(&targetOnly, "target-only", targetOnly, "build only target binaries, not host")
-
-- xflagparse(0)
-+ xflagparse(-1)
-+
-+ if (hostOnly && targetOnly) {
-+ fatalf("specify only one of --host-only or --target-only\n")
-+ }
-+ crossBuild = hostOnly || targetOnly
-+ if flag.NArg() > 0 {
-+ if crossBuild {
-+ toBuild = flag.Args()
-+ } else {
-+ fatalf("package names not permitted without --host-only or --target-only\n")
-+ }
-+ }
-
- if debug {
- // cmd/buildid is used in debug mode.
-@@ -1207,8 +1230,13 @@ func cmdbootstrap() {
- xprintf("\n")
- }
-
-- gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now
-- goldflags = os.Getenv("GO_LDFLAGS")
-+ // For split host/target cross/cross-canadian builds, we don't
-+ // want to be setting these flags until after we have compiled
-+ // the toolchain that runs on the build host.
-+ if ! crossBuild {
-+ gogcflags = os.Getenv("GO_GCFLAGS") // we were using $BOOT_GO_GCFLAGS until now
-+ goldflags = os.Getenv("GO_LDFLAGS")
-+ }
- goBootstrap := pathf("%s/go_bootstrap", tooldir)
- cmdGo := pathf("%s/go", gobin)
- if debug {
-@@ -1237,7 +1265,11 @@ func cmdbootstrap() {
- xprintf("\n")
- }
- xprintf("Building Go toolchain2 using go_bootstrap and Go toolchain1.\n")
-- os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
-+ if crossBuild {
-+ os.Setenv("CC", defaultcc[""])
-+ } else {
-+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
-+ }
- goInstall(goBootstrap, append([]string{"-i"}, toolchain...)...)
- if debug {
- run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-@@ -1274,50 +1306,84 @@ func cmdbootstrap() {
- }
- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
-
-- if goos == oldgoos && goarch == oldgoarch {
-- // Common case - not setting up for cross-compilation.
-- timelog("build", "toolchain")
-- if vflag > 0 {
-- xprintf("\n")
-+ if crossBuild {
-+ gogcflags = os.Getenv("GO_GCFLAGS")
-+ goldflags = os.Getenv("GO_LDFLAGS")
-+ tool_files, _ := filepath.Glob(pathf("%s/*", tooldir))
-+ for _, f := range tool_files {
-+ copyfile(pathf("%s/%s", build_tooldir, filepath.Base(f)), f, writeExec)
-+ xremove(f)
-+ }
-+ os.Setenv("GOTOOLDIR", build_tooldir)
-+ goBootstrap = pathf("%s/go_bootstrap", build_tooldir)
-+ if hostOnly {
-+ timelog("build", "host toolchain")
-+ if vflag > 0 {
-+ xprintf("\n")
-+ }
-+ xprintf("Building %s for host, %s/%s.\n", strings.Join(toBuild, ","), goos, goarch)
-+ goInstall(goBootstrap, toBuild...)
-+ checkNotStale(goBootstrap, toBuild...)
-+ // Skip cmdGo staleness checks here, since we can't necessarily run the cmdGo binary
-+
-+ timelog("build", "target toolchain")
-+ if vflag > 0 {
-+ xprintf("\n")
-+ }
-+ } else if targetOnly {
-+ goos = oldgoos
-+ goarch = oldgoarch
-+ os.Setenv("GOOS", goos)
-+ os.Setenv("GOARCH", goarch)
-+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
-+ xprintf("Building %s for target, %s/%s.\n", strings.Join(toBuild, ","), goos, goarch)
-+ goInstall(goBootstrap, toBuild...)
-+ checkNotStale(goBootstrap, toBuild...)
-+ // Skip cmdGo staleness checks here, since we can't run the target's cmdGo binary
- }
-- xprintf("Building packages and commands for %s/%s.\n", goos, goarch)
- } else {
-- // GOOS/GOARCH does not match GOHOSTOS/GOHOSTARCH.
-- // Finish GOHOSTOS/GOHOSTARCH installation and then
-- // run GOOS/GOARCH installation.
-- timelog("build", "host toolchain")
-- if vflag > 0 {
-- xprintf("\n")
-+
-+ if goos == oldgoos && goarch == oldgoarch {
-+ // Common case - not setting up for cross-compilation.
-+ timelog("build", "toolchain")
-+ if vflag > 0 {
-+ xprintf("\n")
-+ }
-+ xprintf("Building packages and commands for %s/%s.\n", goos, goarch)
-+ } else {
-+ // GOOS/GOARCH does not match GOHOSTOS/GOHOSTARCH.
-+ // Finish GOHOSTOS/GOHOSTARCH installation and then
-+ // run GOOS/GOARCH installation.
-+ timelog("build", "host toolchain")
-+ if vflag > 0 {
-+ xprintf("\n")
-+ }
-+ xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)
-+ goInstall(goBootstrap, "std", "cmd")
-+ checkNotStale(goBootstrap, "std", "cmd")
-+ checkNotStale(cmdGo, "std", "cmd")
-+
-+ timelog("build", "target toolchain")
-+ if vflag > 0 {
-+ xprintf("\n")
-+ }
-+ goos = oldgoos
-+ goarch = oldgoarch
-+ os.Setenv("GOOS", goos)
-+ os.Setenv("GOARCH", goarch)
-+ os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
-+ xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)
- }
-- xprintf("Building packages and commands for host, %s/%s.\n", goos, goarch)
- goInstall(goBootstrap, "std", "cmd")
- checkNotStale(goBootstrap, "std", "cmd")
- checkNotStale(cmdGo, "std", "cmd")
-
-- timelog("build", "target toolchain")
-- if vflag > 0 {
-- xprintf("\n")
-- }
-- goos = oldgoos
-- goarch = oldgoarch
-- os.Setenv("GOOS", goos)
-- os.Setenv("GOARCH", goarch)
-- os.Setenv("CC", compilerEnvLookup(defaultcc, goos, goarch))
-- xprintf("Building packages and commands for target, %s/%s.\n", goos, goarch)
-- }
-- targets := []string{"std", "cmd"}
-- if goos == "js" && goarch == "wasm" {
-- // Skip the cmd tools for js/wasm. They're not usable.
-- targets = targets[:1]
-- }
-- goInstall(goBootstrap, targets...)
-- checkNotStale(goBootstrap, targets...)
-- checkNotStale(cmdGo, targets...)
-- if debug {
-- run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-- run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
-- checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
-- copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
-+ if debug {
-+ run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
-+ run("", ShowOutput|CheckExit, pathf("%s/buildid", tooldir), pathf("%s/pkg/%s_%s/runtime/internal/sys.a", goroot, goos, goarch))
-+ checkNotStale(goBootstrap, append(toolchain, "runtime/internal/sys")...)
-+ copyfile(pathf("%s/compile4", tooldir), pathf("%s/compile", tooldir), writeExec)
-+ }
- }
-
- // Check that there are no new files in $GOROOT/bin other than
-@@ -1335,7 +1401,11 @@ func cmdbootstrap() {
- }
-
- // Remove go_bootstrap now that we're done.
-- xremove(pathf("%s/go_bootstrap", tooldir))
-+ // Except that for split host/target cross-builds, we need to
-+ // keep it.
-+ if ! crossBuild {
-+ xremove(pathf("%s/go_bootstrap", tooldir))
-+ }
-
- // Print trailing banner unless instructed otherwise.
- if !noBanner {
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta-oran/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch
deleted file mode 100644
index 29ef947..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0007-cmd-go-make-GOROOT-precious-by-default.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 7cc60b3887be2d5674b9f5d422d022976cf205e5 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Fri, 2 Mar 2018 06:00:20 -0800
-Subject: [PATCH] cmd/go: make GOROOT precious by default
-
-The go build tool normally rebuilds whatever it detects is
-stale. This can be a problem when GOROOT is intended to
-be read-only and the go runtime has been built as a shared
-library, since we don't want every application to be rebuilding
-the shared runtime - particularly in cross-build/packaging
-setups, since that would lead to 'abi mismatch' runtime errors.
-
-This patch prevents the install and linkshared actions from
-installing to GOROOT unless overridden with the GOROOT_OVERRIDE
-environment variable.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/cmd/go/internal/work/action.go | 3 +++
- src/cmd/go/internal/work/build.go | 5 +++++
- src/cmd/go/internal/work/exec.go | 25 +++++++++++++++++++++++++
- 3 files changed, 33 insertions(+)
-
-Index: go/src/cmd/go/internal/work/action.go
-===================================================================
---- go.orig/src/cmd/go/internal/work/action.go
-+++ go/src/cmd/go/internal/work/action.go
-@@ -600,6 +600,9 @@ func (b *Builder) addTransitiveLinkDeps(
- if p1 == nil || p1.Shlib == "" || haveShlib[filepath.Base(p1.Shlib)] {
- continue
- }
-+ if goRootPrecious && (p1.Standard || p1.Goroot) {
-+ continue
-+ }
- haveShlib[filepath.Base(p1.Shlib)] = true
- // TODO(rsc): The use of ModeInstall here is suspect, but if we only do ModeBuild,
- // we'll end up building an overall library or executable that depends at runtime
-Index: go/src/cmd/go/internal/work/build.go
-===================================================================
---- go.orig/src/cmd/go/internal/work/build.go
-+++ go/src/cmd/go/internal/work/build.go
-@@ -147,6 +147,7 @@ See also: go install, go get, go clean.
- }
-
- const concurrentGCBackendCompilationEnabledByDefault = true
-+var goRootPrecious bool = true
-
- func init() {
- // break init cycle
-@@ -160,6 +161,10 @@ func init() {
-
- AddBuildFlags(CmdBuild)
- AddBuildFlags(CmdInstall)
-+
-+ if x := os.Getenv("GOROOT_OVERRIDE"); x != "" {
-+ goRootPrecious = false
-+ }
- }
-
- // Note that flags consulted by other parts of the code
-Index: go/src/cmd/go/internal/work/exec.go
-===================================================================
---- go.orig/src/cmd/go/internal/work/exec.go
-+++ go/src/cmd/go/internal/work/exec.go
-@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err
- return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)
- }
-
-+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {
-+ _, err := os.Stat(a.Package.Target)
-+ if err == nil {
-+ a.built = a.Package.Target
-+ a.Target = a.Package.Target
-+ a.buildID = b.fileHash(a.Package.Target)
-+ a.Package.Stale = false
-+ a.Package.StaleReason = "GOROOT-resident package"
-+ return nil
-+ }
-+ a.Package.Stale = true
-+ a.Package.StaleReason = "missing or invalid GOROOT-resident package"
-+ if b.IsCmdList {
-+ return nil
-+ }
-+ }
-+
- if err := b.Mkdir(a.Objdir); err != nil {
- return err
- }
-@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act
- return nil
- }
-
-+ if goRootPrecious && a.Package != nil {
-+ p := a.Package
-+ if p.Standard || p.Goroot {
-+ err := fmt.Errorf("attempting to install package %s into read-only GOROOT", p.ImportPath)
-+ return err
-+ }
-+ }
-+
- if err := b.Mkdir(a.Objdir); err != nil {
- return err
- }
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta-oran/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch
deleted file mode 100644
index 225cf43..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0008-use-GOBUILDMODE-to-set-buildmode.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 26 Oct 2018 15:02:32 +0800
-Subject: [PATCH] use GOBUILDMODE to set buildmode
-
-While building go itself, the go build system does not support
-to set `-buildmode=pie' from environment.
-
-Add GOBUILDMODE to support it which make PIE executables the default
-build mode, as PIE executables are required as of Yocto
-
-Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI
-Upstream-Status: Denied [upstream choose antoher solution: `17a256b
-cmd/go: -buildmode=pie for android/arm']
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- src/cmd/go/internal/work/build.go | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: go/src/cmd/go/internal/work/build.go
-===================================================================
---- go.orig/src/cmd/go/internal/work/build.go
-+++ go/src/cmd/go/internal/work/build.go
-@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) {
-
- cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")
- cmd.Flag.Var(buildCompiler{}, "compiler", "")
-- cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")
-+ if bm := os.Getenv("GOBUILDMODE"); bm != "" {
-+ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", bm, "")
-+ } else {
-+ cmd.Flag.StringVar(&cfg.BuildBuildmode, "buildmode", "default", "")
-+ }
- cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")
- cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")
- cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")
diff --git a/meta-oran/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/meta-oran/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch
deleted file mode 100644
index 840cf4b..0000000
--- a/meta-oran/recipes-devtools/go/go-1.12/0009-ld-replace-glibc-dynamic-linker-with-musl.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 35ea4be34e94912b00837e0f7c7385f2e98fe769 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Sun, 18 Feb 2018 08:24:05 -0800
-Subject: [PATCH] ld: replace glibc dynamic linker with musl
-
-Rework of patch by Khem Raj <raj.khem@gmail.com>
-for go 1.10. Should be applied conditionally on
-musl being the system C library.
-
-Upstream-Status: Inappropriate [Real fix should be portable across libcs]
-
-Signed-off-by: Matt Madison <matt@madison.systems>
-
----
- src/cmd/link/internal/amd64/obj.go | 2 +-
- src/cmd/link/internal/arm/obj.go | 2 +-
- src/cmd/link/internal/arm64/obj.go | 2 +-
- src/cmd/link/internal/mips/obj.go | 2 +-
- src/cmd/link/internal/mips64/obj.go | 2 +-
- src/cmd/link/internal/ppc64/obj.go | 2 +-
- src/cmd/link/internal/s390x/obj.go | 2 +-
- src/cmd/link/internal/x86/obj.go | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/src/cmd/link/internal/amd64/obj.go
-+++ b/src/cmd/link/internal/amd64/obj.go
-@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {
- PEreloc1: pereloc1,
- TLSIEtoLE: tlsIEtoLE,
-
-- Linuxdynld: "/lib64/ld-linux-x86-64.so.2",
-+ Linuxdynld: "/lib64/ld-musl-x86-64.so.1",
- Freebsddynld: "/libexec/ld-elf.so.1",
- Openbsddynld: "/usr/libexec/ld.so",
- Netbsddynld: "/libexec/ld.elf_so",
---- a/src/cmd/link/internal/arm/obj.go
-+++ b/src/cmd/link/internal/arm/obj.go
-@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Machoreloc1: machoreloc1,
- PEreloc1: pereloc1,
-
-- Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI
-+ Linuxdynld: "/lib/ld-musl-armhf.so.1",
- Freebsddynld: "/usr/libexec/ld-elf.so.1",
- Openbsddynld: "/usr/libexec/ld.so",
- Netbsddynld: "/libexec/ld.elf_so",
---- a/src/cmd/link/internal/arm64/obj.go
-+++ b/src/cmd/link/internal/arm64/obj.go
-@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Gentext: gentext,
- Machoreloc1: machoreloc1,
-
-- Linuxdynld: "/lib/ld-linux-aarch64.so.1",
-+ Linuxdynld: "/lib/ld-musl-aarch64.so.1",
-
- Freebsddynld: "XXX",
- Openbsddynld: "XXX",
---- a/src/cmd/link/internal/mips/obj.go
-+++ b/src/cmd/link/internal/mips/obj.go
-@@ -60,7 +60,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Gentext: gentext,
- Machoreloc1: machoreloc1,
-
-- Linuxdynld: "/lib/ld.so.1",
-+ Linuxdynld: "/lib/ld-musl-mipsle.so.1",
-
- Freebsddynld: "XXX",
- Openbsddynld: "XXX",
---- a/src/cmd/link/internal/mips64/obj.go
-+++ b/src/cmd/link/internal/mips64/obj.go
-@@ -59,7 +59,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Gentext: gentext,
- Machoreloc1: machoreloc1,
-
-- Linuxdynld: "/lib64/ld64.so.1",
-+ Linuxdynld: "/lib64/ld-musl-mips64le.so.1",
- Freebsddynld: "XXX",
- Openbsddynld: "XXX",
- Netbsddynld: "XXX",
---- a/src/cmd/link/internal/ppc64/obj.go
-+++ b/src/cmd/link/internal/ppc64/obj.go
-@@ -62,7 +62,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Machoreloc1: machoreloc1,
-
- // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
-- Linuxdynld: "/lib64/ld64.so.1",
-+ Linuxdynld: "/lib64/ld-musl-powerpc64le.so.1",
-
- Freebsddynld: "XXX",
- Openbsddynld: "XXX",
---- a/src/cmd/link/internal/s390x/obj.go
-+++ b/src/cmd/link/internal/s390x/obj.go
-@@ -57,7 +57,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Gentext: gentext,
- Machoreloc1: machoreloc1,
-
-- Linuxdynld: "/lib64/ld64.so.1",
-+ Linuxdynld: "/lib64/ld-musl-s390x.so.1",
-
- // not relevant for s390x
- Freebsddynld: "XXX",
---- a/src/cmd/link/internal/x86/obj.go
-+++ b/src/cmd/link/internal/x86/obj.go
-@@ -58,7 +58,7 @@ func Init() (*sys.Arch, ld.Arch) {
- Machoreloc1: machoreloc1,
- PEreloc1: pereloc1,
-
-- Linuxdynld: "/lib/ld-linux.so.2",
-+ Linuxdynld: "/lib/ld-musl-i386.so.1",
- Freebsddynld: "/usr/libexec/ld-elf.so.1",
- Openbsddynld: "/usr/libexec/ld.so",
- Netbsddynld: "/usr/libexec/ld.elf_so",
diff --git a/meta-oran/recipes-devtools/go/go-cross-canadian_1.12.bb b/meta-oran/recipes-devtools/go/go-cross-canadian_1.12.bb
deleted file mode 100644
index 85fa979..0000000
--- a/meta-oran/recipes-devtools/go/go-cross-canadian_1.12.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2019 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 recipes-devtools/go/go-cross-canadian.inc
-require go-${PV}.inc
diff --git a/meta-oran/recipes-devtools/go/go-cross_1.12.bb b/meta-oran/recipes-devtools/go/go-cross_1.12.bb
deleted file mode 100644
index 8586db9..0000000
--- a/meta-oran/recipes-devtools/go/go-cross_1.12.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2019 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 recipes-devtools/go/go-cross.inc
-require go-${PV}.inc
diff --git a/meta-oran/recipes-devtools/go/go-crosssdk_1.12.bb b/meta-oran/recipes-devtools/go/go-crosssdk_1.12.bb
deleted file mode 100644
index f97461d..0000000
--- a/meta-oran/recipes-devtools/go/go-crosssdk_1.12.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2019 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 recipes-devtools/go/go-crosssdk.inc
-require go-${PV}.inc
diff --git a/meta-oran/recipes-devtools/go/go-native_1.12.bb b/meta-oran/recipes-devtools/go/go-native_1.12.bb
deleted file mode 100644
index cc2aef7..0000000
--- a/meta-oran/recipes-devtools/go/go-native_1.12.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2019 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 recipes-devtools/go/${PN}.inc
-require go-${PV}.inc
diff --git a/meta-oran/recipes-devtools/go/go-runtime_1.12.bb b/meta-oran/recipes-devtools/go/go-runtime_1.12.bb
deleted file mode 100644
index dcf16d8..0000000
--- a/meta-oran/recipes-devtools/go/go-runtime_1.12.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2019 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 go-${PV}.inc
-require recipes-devtools/go/go-runtime.inc
diff --git a/meta-oran/recipes-devtools/go/go_1.12.bb b/meta-oran/recipes-devtools/go/go_1.12.bb
deleted file mode 100644
index e37d1ac..0000000
--- a/meta-oran/recipes-devtools/go/go_1.12.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2019 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 go-${PV}.inc
-require recipes-devtools/go/go-target.inc
-
-export GOBUILDMODE=""
-
-# Add pie to GOBUILDMODE to satisfy "textrel" QA checking, but mips
-# doesn't support -buildmode=pie, so skip the QA checking for mips and its
-# variants.
-python() {
- if 'mips' in d.getVar('TARGET_ARCH'):
- d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel")
- else:
- d.setVar('GOBUILDMODE', 'pie')
-}
diff --git a/meta-oran/recipes-extended/dpdk/dpdk.inc b/meta-oran/recipes-extended/dpdk/dpdk.inc
deleted file mode 100644
index 6af8d21..0000000
--- a/meta-oran/recipes-extended/dpdk/dpdk.inc
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-DESCRIPTION = "Intel(r) Data Plane Development Kit"
-HOMEPAGE = "http://dpdk.org"
-
-STABLE = ""
-BRANCH = "master"
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \
- file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
- file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \
- "
-
-COMPATIBLE_MACHINE = "null"
-COMPATIBLE_HOST_libc-musl_class-target = "null"
-COMPATIBLE_HOST_linux-gnux32 = "null"
-
-# dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
-# fuse is in meta-filesystems and qat is not yet upstreamed.
-# So adding mechanism to explicitly disable the use of fuse and qat.
-# To enable, uncomment the below line or include in .bbappend.
-# PACKAGECONFIG ?= " dpdk_qat vhost libvirt"
-
-PACKAGECONFIG[dpdk_qat] = ",,virtual/qat"
-PACKAGECONFIG[vhost] = ",,fuse"
-PACKAGECONFIG[libvirt] = ",,libvirt"
-PACKAGECONFIG[numa] = ",,numactl"
-
-export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qat', 'y', 'n', d)}"
-export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
-export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
-export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n', d)}"
-
-# Don't use the default value of datadir and let the dpdk set it to a dpdk
-# specific directory
-datadir[unexport] = "1"
-
-RDEPENDS_${PN} += "python-subprocess"
-DEPENDS = "virtual/kernel"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
-
-inherit module
-
-export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
-export RTE_SDK = "${S}"
-
-export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
-export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib"
-export RTE_KERNELDIR = "${STAGING_KERNEL_DIR}"
-export RTE_KERNELDIR_OUT = "${STAGING_KERNEL_BUILDDIR}"
-export INSTALL_PATH = "${prefix}/share/dpdk"
-export RTE_OUTPUT = "${S}/${RTE_TARGET}"
-export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/"
-export SYSROOTPATH = "--sysroot=${STAGING_DIR_HOST}"
-export DPDK_TARGET_MACH = "${@get_dpdk_target_mach(bb,d)}"
-export ICP_LAC_API_DIR = "${STAGING_DIR_TARGET}${includedir}/lac"
-
-export EXAMPLES_BUILD_DIR = "${RTE_TARGET}"
-export ARCHDIR = "generic"
-
-DPDK_RTE_TARGET_x86-64 = "x86_64-native-linuxapp-gcc"
-DPDK_RTE_TARGET_x86 = "i686-native-linuxapp-gcc"
-DPDK_RTE_TARGET_aarch64 = "arm64-${DPDK_TARGET_MACH}-linuxapp-gcc"
-export RTE_TARGET = "${DPDK_RTE_TARGET}"
-
-# The list of intel Comms platforms and their target machine
-# process mapping. The supported target machine is listed under
-# dpdk/mk/machine
-def get_dpdk_target_mach(bb, d):
- target_arch = d.getVar('DPDK_TARGET_MACHINE', True)
- if target_arch:
- return target_arch
- return "default"
-
-do_configure () {
- #############################################################
- ### default value for prefix is "usr", unsetting it, so it
- ### will not be concatenated in ${RTE_TARGET}/Makefile
- ### which will cause compilation failure
- #############################################################
- unset prefix
-
- # Fix-up CONFIG_RTE_MACHINE based on target machine
- sed -e "s#CONFIG_RTE_MACHINE=\"native\"#CONFIG_RTE_MACHINE=\"${DPDK_TARGET_MACH}\"#" -i ${S}/config/defconfig_${RTE_TARGET}
-
- # Fix-up vhost configs based on package config
- sed -e "s#CONFIG_RTE_KNI_VHOST=n#CONFIG_RTE_KNI_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linux
- sed -e "s#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n#CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linux
- sed -e "s#CONFIG_RTE_LIBRTE_VHOST=n#CONFIG_RTE_LIBRTE_VHOST=${CONFIG_VHOST_ENABLED}#" -i ${S}/config/common_linux
- sed -e "s#CONFIG_RTE_LIBRTE_VHOST_NUMA=.*#CONFIG_RTE_LIBRTE_VHOST_NUMA=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linux
- sed -e "s#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=.*#CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=${CONFIG_HAVE_NUMA}#" -i ${S}/config/common_linux
-
- # Fix-up CONFIG_RTE_LIBRTE_POWER based on package config for libvirt
- sed -e "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE_VM_POWER_MANAGER}#" -i ${S}/config/common_linux
-
- make O=$RTE_TARGET T=$RTE_TARGET config
-}
-
-do_compile () {
- unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
-
- cd ${S}/${RTE_TARGET}
- oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" \
- EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
- CROSS="${TARGET_PREFIX}" \
- prefix="" LDFLAGS="${TUNE_LDARGS}" WERROR_FLAGS="-w" V=1
-
- cd ${S}/examples/
- oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
- EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
- CROSS="${TARGET_PREFIX}" O="${S}/examples/$@/"
-
- cd ${S}/app/test
- oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu -fuse-ld=bfd" \
- EXTRA_CFLAGS="${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -I${STAGING_INCDIR}" \
- CROSS="${TARGET_PREFIX}" O="${S}/app/test/$@/"
-}
-
-do_install () {
- oe_runmake O=${RTE_OUTPUT} T= install-runtime DESTDIR=${D}
- oe_runmake O=${RTE_OUTPUT} T= install-kmod DESTDIR=${D} kerneldir=${MODULE_DIR}
- oe_runmake O=${RTE_OUTPUT} T= install-sdk DESTDIR=${D}
-
- # Install examples
- for dirname in ${S}/examples/*
- do
- install -m 0755 -d ${D}/${INSTALL_PATH}/examples/`basename ${dirname}`
-
- for appname in `find ${dirname} -regex ".*${EXAMPLES_BUILD_DIR}\/app\/[-0-9a-zA-Z0-9/_]*$"`
- do
- install -m 755 ${appname} ${D}/${INSTALL_PATH}/examples/`basename ${dirname}`/
- done
- done
-
- # Install test
- for dirname in ${S}/app/test/app/*
- do
- install -m 0755 -d ${D}/${INSTALL_PATH}/test
-
- for appname in `find ${dirname} -regex ".*test\/app\/[-0-9a-zA-Z0-9/_]*$"`
- do
- install -m 755 ${appname} ${D}/${INSTALL_PATH}/test
- done
- done
-
- cp -r ${S}/mk ${D}${INSTALL_PATH}/
-}
-
-PACKAGES += "${PN}-examples ${PN}-test"
-
-FILES_${PN}-dbg += " \
- ${INSTALL_PATH}/.debug \
- ${INSTALL_PATH}/examples/*/.debug \
- "
-
-FILES_${PN}-doc += "\
- ${INSTALL_PATH}/doc \
- "
-
-FILES_${PN}-dev += " \
- ${INSTALL_PATH}/${RTE_TARGET}/.config \
- ${includedir} \
- ${includedir}/${ARCHDIR} \
- ${includedir}/exec-env \
- ${INSTALL_PATH}/buildtools/ \
- ${INSTALL_PATH}/${RTE_TARGET}/include \
- ${INSTALL_PATH}/${RTE_TARGET}/lib \
- ${INSTALL_PATH}/mk \
- "
-
-FILES_${PN} += " ${INSTALL_PATH}/usertools/ \
- ${prefix}/sbin/ \
- ${prefix}/bin/ \
- ${libdir}/ \
- "
-FILES_${PN}-examples += " \
- ${INSTALL_PATH}/examples/* \
- "
-
-FILES_${PN}-test += " \
- ${INSTALL_PATH}/test \
- "
diff --git a/meta-oran/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch b/meta-oran/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
deleted file mode 100644
index 2facd39..0000000
--- a/meta-oran/recipes-extended/dpdk/dpdk/0001-examples-Fix-maybe-uninitialized-warning.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 41ac64efa5050430b73e0f8813dffc7327083273 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 1 Aug 2017 20:18:46 -0700
-Subject: [PATCH] examples: Fix maybe-uninitialized warning
-
-Initialize arrays to 0, makes compiler happy about
-
-error: 'vals[0]' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- examples/qos_sched/args.c | 2 +-
- examples/vhost/virtio_net.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
-index 83eee95cc28e..3d2c0fbd6d0a 100644
---- a/examples/qos_sched/args.c
-+++ b/examples/qos_sched/args.c
-@@ -212,7 +212,7 @@ static int
- app_parse_flow_conf(const char *conf_str)
- {
- int ret;
-- uint32_t vals[5];
-+ uint32_t vals[5] = {0};
- struct flow_conf *pconf;
- uint64_t mask;
-
-diff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c
-index f6e00674d9af..a4a90704d7b4 100644
---- a/examples/vhost/virtio_net.c
-+++ b/examples/vhost/virtio_net.c
-@@ -293,7 +293,7 @@ vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,
- {
- struct vhost_queue *queue;
- struct rte_vhost_vring *vr;
-- uint32_t desc_indexes[MAX_PKT_BURST];
-+ uint32_t desc_indexes[MAX_PKT_BURST] = {0};
- uint32_t used_idx;
- uint32_t i = 0;
- uint16_t free_entries;
diff --git a/meta-oran/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch b/meta-oran/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
deleted file mode 100644
index 603bd32..0000000
--- a/meta-oran/recipes-extended/dpdk/dpdk/dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0808b30cd00f307f182007d21a8be3a0866ccf83 Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Fri, 18 Dec 2015 18:30:47 +0800
-Subject: [PATCH] dpdk v2.2.0: add RTE_KERNELDIR_OUT to split kernel build
- artifact
-
-Introduce RTE_KERNELDIR_OUT to be the path to which kernel build
-artifacts are located. This is for matching the workflow change
-since Yocto Project v1.8 onwards whereby tmp/work-shared contains
-separate directories for kernel source and kernel artifacts.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-
----
- mk/rte.module.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mk/rte.module.mk b/mk/rte.module.mk
-index 1ada528a00b1..da0538cd5321 100644
---- a/mk/rte.module.mk
-+++ b/mk/rte.module.mk
-@@ -48,7 +48,7 @@ build: _postbuild
- # build module
- $(MODULE).ko: $(SRCS_LINKS)
- @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
-- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
-+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
- CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0)
-
- # install module in $(RTE_OUTPUT)/kmod
-@@ -59,7 +59,7 @@ $(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
-
- # install module
- modules_install:
-- @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
-+ @$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) \
- modules_install
-
- .PHONY: clean
-@@ -69,7 +69,7 @@ clean: _postclean
- .PHONY: doclean
- doclean:
- @if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
-- $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
-+ $(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR_OUT) clean
- @$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
- if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
- @if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
diff --git a/meta-oran/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch b/meta-oran/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch
deleted file mode 100644
index 18b761c..0000000
--- a/meta-oran/recipes-extended/dpdk/dpdk/dpdk-16.07-add-sysroot-option-within-app-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d08d11c8b6fdfe73884d67a94d907000afd136ed Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-Date: Fri, 19 Aug 2016 11:57:49 +0800
-Subject: [PATCH] dpdk: add --sysroot option within app makefile
-
-Upstream-Status: Inappropriate [configuration]
-
-rte.app.mk has been changed to add -Wl, to all items listed
-under EXTRA_LDFLAGS. It causes --sysroot=<path> to not setup
-correctly when we depends on gcc to setup for GNU ld.
-
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
-
----
- mk/rte.app.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/rte.app.mk b/mk/rte.app.mk
-index 3eb41d176d21..9ab6688718db 100644
---- a/mk/rte.app.mk
-+++ b/mk/rte.app.mk
-@@ -300,7 +300,7 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
- ifeq ($(LINK_USING_CC),1)
- O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \
- $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-- $(MAPFLAGS))
-+ $(MAPFLAGS)) $(SYSROOTPATH)
- else
- O_TO_EXE = $(LD) -o $@ $(OBJS-y) \
- $(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
diff --git a/meta-oran/recipes-extended/dpdk/dpdk_19.11.bb b/meta-oran/recipes-extended/dpdk/dpdk_19.11.bb
deleted file mode 100644
index 9cd8eb9..0000000
--- a/meta-oran/recipes-extended/dpdk/dpdk_19.11.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-include dpdk.inc
-
-SRCREV = "7001c8fdb27357c67147c0a13cb3826e48c0f2bf"
-
-LICENSE = "BSD & LGPLv2 & GPLv2"
-LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \
- file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444"
-
-SRC_URI += "\
- file://0001-examples-Fix-maybe-uninitialized-warning.patch \
- "
diff --git a/meta-oran/recipes-kernel/linux/kernel-devsrc.bb b/meta-oran/recipes-kernel/linux/kernel-devsrc.bb
deleted file mode 100644
index bde4884..0000000
--- a/meta-oran/recipes-kernel/linux/kernel-devsrc.bb
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Copyright (C) 2019 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/meta-oran/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/meta-oran/recipes-kernel/linux/linux-yocto-rt_%.bbappend
deleted file mode 100644
index 77c2dfe..0000000
--- a/meta-oran/recipes-kernel/linux/linux-yocto-rt_%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2019 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.
-TARGET_SUPPORTED_KTYPES_append_nxp-lx2xxx = " preempt-rt"
diff --git a/meta-oran/recipes-networking/cni/cni_git.bbappend b/meta-oran/recipes-networking/cni/cni_git.bbappend
deleted file mode 100644
index 677fe8f..0000000
--- a/meta-oran/recipes-networking/cni/cni_git.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-inherit go112
-
-do_compile_append() {
- # build ipam plugins
- cd ${S}/src/import/vendor/github.com/containernetworking/plugins/
- PLUGINS="$(ls -d plugins/ipam/*)"
- mkdir -p ${WORKDIR}/plugins/bin/
- for p in $PLUGINS; do
- plugin="$(basename "$p")"
- echo "building: $p"
- go build -o ${WORKDIR}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
- done
-}
diff --git a/meta-oran/templates/feature/hosts-ia/README b/meta-oran/templates/feature/hosts-ia/README
deleted file mode 100644
index 432eba4..0000000
--- a/meta-oran/templates/feature/hosts-ia/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a template for performace tunning of wrlinux preempt-rt kernel.
-
-* Tested server:
- - HP DL380P
diff --git a/meta-oran/templates/feature/hosts-ia/files/hpsa.cfg b/meta-oran/templates/feature/hosts-ia/files/hpsa.cfg
deleted file mode 100644
index cf1c8f3..0000000
--- a/meta-oran/templates/feature/hosts-ia/files/hpsa.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-# for HP Smart Array
-CONFIG_SCSI_HPSA=y
-
-# for Broadcom Tigon3 and bcm 8517
-CONFIG_TIGON3=y
-CONFIG_TIGON3_HWMON=y
-
-# for Emulex Blade Engine
-CONFIG_BE2NET=m
-CONFIG_BE2ISCSI=m
-
-# config fragments for Broadcom NetExtremeII
-CONFIG_BNX2=m
-CONFIG_BNX2X=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_SCSI_BNX2_ISCSI=m
-
-# config fragment for HP misc
-CONFIG_HP_ILO=y
-CONFIG_HP_WATCHDOG=y
-
-# config fragment for Intel C600 SAS controller
-CONFIG_SCSI_ISCI=y
-
-# config fragment for Emulex LightPulse Family of Fibre Channel PCI host adapters
-CONFIG_SCSI_LPFC=m
-
-# config fragments for Mellanox ethernet support
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_CORE=m
-
-# config fragment for LSI SAS controllers
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-
-# config fragment for QLogic storage and NIC adapters
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_QLA3XXX=m
diff --git a/meta-oran/templates/feature/hosts-ia/files/other_drivers.cfg b/meta-oran/templates/feature/hosts-ia/files/other_drivers.cfg
deleted file mode 100644
index 32fca9a..0000000
--- a/meta-oran/templates/feature/hosts-ia/files/other_drivers.cfg
+++ /dev/null
@@ -1,570 +0,0 @@
-# refer to config-4.14.106-200.el7.x86_64
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_NETLINK=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-# CONFIG_SCSI_AIC94XX is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-# CONFIG_SCSI_DPT_I2O is not set
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=y
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_XEN_SCSI_FRONTEND=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_QEDI=m
-CONFIG_QEDF=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-# CONFIG_DM_MQ_DEFAULT is not set
-CONFIG_DM_DEBUG=y
-CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_BIO_PRISON=y
-CONFIG_DM_PERSISTENT_DATA=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_THIN_PROVISIONING=y
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-# CONFIG_DM_ERA is not set
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=y
-CONFIG_DM_MULTIPATH=y
-CONFIG_DM_MULTIPATH_QL=y
-CONFIG_DM_MULTIPATH_ST=y
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_ZONED=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=40
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-CONFIG_FUSION_LOGGING=y
-
-CONFIG_DRM_MGAG200=y
-CONFIG_RAID_ATTRS=y
-
-#
-# USB Power Delivery and Type-C drivers
-#
-CONFIG_TYPEC_TCPM=m
-CONFIG_TYPEC_TCPCI=m
-CONFIG_TYPEC_FUSB302=m
-CONFIG_DRM_VBOXVIDEO=m
-# CONFIG_PI433 is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_WMI_LED=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_SURFACE3_WMI=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-# CONFIG_INTEL_MENLOW is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ACPI_WMI=m
-CONFIG_WMI_BMOF=m
-CONFIG_MSI_WMI=m
-CONFIG_PEAQ_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_CHT_INT33FE=m
-CONFIG_INTEL_INT0002_VGPIO=m
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_VBTN=m
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_PMC_CORE=y
-# CONFIG_IBM_RTL is not set
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
-CONFIG_INTEL_PMC_IPC=y
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_MLX_PLATFORM=m
-CONFIG_INTEL_TURBO_MAX_3=y
-CONFIG_SILEAD_DMI=y
-CONFIG_PMC_ATOM=y
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-CONFIG_CROS_KBD_LED_BACKLIGHT=m
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AT803X_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_CORTINA_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_MARVELL_10G_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-# CONFIG_ROCKCHIP_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_MICREL_KS8995MA is not set
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-# CONFIG_USB_NET_SR9800 is not set
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_WLAN=y
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-CONFIG_ATH5K_DEBUG=y
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_COMMON_DEBUG=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-CONFIG_ATH9K_DEBUGFS=y
-# CONFIG_ATH9K_STATION_STATISTICS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_ATH9K_HWRNG is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-# CONFIG_CARL9170_DEBUGFS is not set
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-CONFIG_ATH10K_SDIO=m
-CONFIG_ATH10K_USB=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
diff --git a/meta-oran/templates/feature/hosts-ia/template.conf b/meta-oran/templates/feature/hosts-ia/template.conf
deleted file mode 100644
index ee1b9c5..0000000
--- a/meta-oran/templates/feature/hosts-ia/template.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-#
-# Template to enable support for IA hosts
-#
-
-EXTRA_KERNEL_FILES =. "${TEMPLATES_PATH}/feature/hosts-ia/files:"
-EXTRA_KERNEL_SRC_URI += " \
- file://hpsa.cfg \
- file://other_drivers.cfg \
-"
diff --git a/meta-oran/templates/feature/kubernetes/README b/meta-oran/templates/feature/kubernetes/README
deleted file mode 100644
index c0c32ba..0000000
--- a/meta-oran/templates/feature/kubernetes/README
+++ /dev/null
@@ -1 +0,0 @@
-This is a template for kubernetes
diff --git a/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg b/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg
deleted file mode 100644
index 026a9b2..0000000
--- a/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg
+++ /dev/null
@@ -1,113 +0,0 @@
-##################
-# From lxc.cfg
-##################
-
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_MEMCG=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_NET_PRIO=m
-
-# Virtual drivers
-CONFIG_VIRTIO_BLK=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_VIRTIO_NET=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_MMIO=y
-
-# Base support for live boot
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_VFAT_FS=y
-CONFIG_RD_GZIP=y
-
-# Support for virtual ethernet and LXC
-CONFIG_VETH=y
-CONFIG_MACVLAN=y
-
-
-#####################
-# From docker.cfg
-#####################
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_NF_NAT=m
-CONFIG_NF_CONNTRACK_IPV4=y
-
-CONFIG_DM_THIN_PROVISIONING=m
-
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-
-CONFIG_OVERLAY_FS=y
-
-#####################
-# From vswitch.cfg
-####################
-
-CONFIG_OPENVSWITCH=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_ACT_POLICE=m
-
-######################
-# From ebtables.cfg
-#####################
-
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-
-
-# for kubernetes
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_OPENVSWITCH_VXLAN=m
-
-CONFIG_IP_VS=y
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-CONFIG_IP_VS_SH_TAB_BITS=8
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-# for flannel vxlan
-CONFIG_VXLAN=m
-
-# for issue: rcu_preempt detected stalls on CPUs/tasks
-CONFIG_RCU_NOCB_CPU=y
diff --git a/meta-oran/templates/feature/kubernetes/image.inc b/meta-oran/templates/feature/kubernetes/image.inc
deleted file mode 100644
index f7167bf..0000000
--- a/meta-oran/templates/feature/kubernetes/image.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-IMAGE_INSTALL += "kubernetes"
-
-# required by kubernetes
-IMAGE_INSTALL += "iproute2-tc"
diff --git a/meta-oran/templates/feature/kubernetes/template.conf b/meta-oran/templates/feature/kubernetes/template.conf
deleted file mode 100644
index 3db4d9c..0000000
--- a/meta-oran/templates/feature/kubernetes/template.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-#
-# Template to enable kubernetes support
-#
-
-
-EXTRA_KERNEL_FILES =. "${TEMPLATES_PATH}/feature/kubernetes/files:"
-EXTRA_KERNEL_SRC_URI += "\
- file://docker_kube.cfg \
-"
-
-KERNEL_FEATURES_append += " \
- features/cgroups/cgroups.scc \
-"
-
-
-# Whitelist for meta-virtualization
-PNWHITELIST_virtualization-layer_append = " \
- cni \
- kubernetes \
-"
-
-#PREFERRED_PROVIDER_virtual/containerd = "containerd-docker"
diff --git a/meta-oran/templates/feature/oran-guest-rt-tune/files/oran-guest-rt-tune.cfg b/meta-oran/templates/feature/oran-guest-rt-tune/files/oran-guest-rt-tune.cfg
deleted file mode 100644
index 958891e..0000000
--- a/meta-oran/templates/feature/oran-guest-rt-tune/files/oran-guest-rt-tune.cfg
+++ /dev/null
@@ -1,69 +0,0 @@
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_RCU_NOCB_CPU=y
-
-# CONFIG_PROFILING is not set
-# CONFIG_KPROBES is not set
-
-# CONFIG_SCHED_SMT is not set
-# CONFIG_KSM is not set
-
-# CONFIG_SUSPEND is not set
-# CONFIG_PM is not set
-
-# CONFIG_SCHED_MC_PRIO is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_X86_PCC_CPUFREQ is not set
-
-# CONFIG_INTEL_IDLE is not set
-
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-
-# CONFIG_SERIO is not set
-
-# CONFIG_HPET is not set
-
-# CONFIG_AGP is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_DRM is not set
-# CONFIG_FB is not set
-
-# CONFIG_SOUND is not set
-
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_USB is not set
-
-# CONFIG_EDAC is not set
-
-# CONFIG_DMADEVICES is not set
-
-# CONFIG_HYPERV is not set
-
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_FRAME_POINTER is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_FTRACE is not set
-# CONFIG_KGDB is not set
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_DEBUG_RODATA is not set
-
-# CONFIG_E100 is not set
-# CONFIG_E1000 is not set
-# CONFIG_E1000E is not set
-CONFIG_IGB=y
-CONFIG_HIGH_RES_TIMERS=y
diff --git a/meta-oran/templates/feature/oran-guest-rt-tune/template.conf b/meta-oran/templates/feature/oran-guest-rt-tune/template.conf
deleted file mode 100644
index 80943b6..0000000
--- a/meta-oran/templates/feature/oran-guest-rt-tune/template.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-
-EXTRA_KERNEL_FILES =. "${TEMPLATES_PATH}/feature/oran-guest-rt-tune/files:"
-EXTRA_KERNEL_SRC_URI += "file://oran-guest-rt-tune.cfg"
diff --git a/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg b/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg
deleted file mode 100644
index 1bc7c6d..0000000
--- a/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg
+++ /dev/null
@@ -1,64 +0,0 @@
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_RCU_NOCB_CPU=y
-
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_SCHED is not set
-
-CONFIG_NAMESPACES=y
-
-# CONFIG_PROFILING is not set
-# CONFIG_KPROBES is not set
-
-# CONFIG_SCHED_SMT is not set
-CONFIG_KSM=y
-
-# CONFIG_SUSPEND is not set
-# CONFIG_PM is not set
-
-# CONFIG_SCHED_MC_PRIO is not set
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_X86_PCC_CPUFREQ is not set
-
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-
-# CONFIG_HPET is not set
-# CONFIG_HPET_MMAP is not set
-
-CONFIG_USB_SUPPORT=y
-CONFIG_USB=y
-
-# CONFIG_HYPERV is not set
-
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_LATENCYTOP is not set
-# CONFIG_KGDB is not set
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_CONTEXT_TRACKING is not set
-# CONFIG_AUDIT is not set
-
-# CONFIG_SCSI_DEBUG is not set
-
-# CONFIG_HIBERNATION is not set
-
-# CONFIG_NUMA_BALANCING is not set
-# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_INTEL_IDLE=y
-# CONFIG_INPUT_MOUSEDEV is not set
diff --git a/meta-oran/templates/feature/oran-host-rt-tune/template.conf b/meta-oran/templates/feature/oran-host-rt-tune/template.conf
deleted file mode 100644
index d7376b8..0000000
--- a/meta-oran/templates/feature/oran-host-rt-tune/template.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2019 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.
-
-
-EXTRA_KERNEL_FILES =. "${TEMPLATES_PATH}/feature/oran-host-rt-tune/files:"
-EXTRA_KERNEL_SRC_URI += "file://oran-host-rt-tune.cfg"
diff --git a/scripts/build_oran.sh b/scripts/build_oran.sh
deleted file mode 100755
index a8ac778..0000000
--- a/scripts/build_oran.sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 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.
-
-# Ensure we fail the job if any steps fail.
-set -e -o pipefail
-
-SUPPORTED_BSP="intel-x86-64 nxp-lx2xxx"
-WRTEMPLATE_COMMON="feature/oran-host-rt-tune feature/kubernetes feature/self-hosted"
-WRTEMPLATE_X86="feature/hosts-ia feature/kvm feature/dpdk"
-
-SRC_ORAN_BRANCH="master"
-SRC_WRL_BRANCH="WRLINUX_10_18_BASE"
-SRC_WRL_URL="git://github.com/WindRiver-Labs/wrlinux-x.git"
-
-SCRIPTS_DIR=$(dirname $(readlink -f $0))
-
-help_info () {
-cat << ENDHELP
-Usage:
-$(basename $0) <-w WORKSPACE_DIR> [-b BSP] [-n] [-h] [-r]
-where:
- -w WORKSPACE_DIR is the path for the project
- -b BPS is one of supported BSP: "${SUPPORTED_BSP}"
- (default is intel-x86-64 if not specified.)
- -n dry-run only for bitbake
- -h this help info
- -e EXTRA_CONF is the pat for extra config file
- -r whether to inherit rm_work (default is Yes)
-ENDHELP
-}
-
-echo_info () {
- echo "INFO: $1"
-}
-
-echo_error () {
- echo "ERROR: $1"
-}
-
-echo_cmd () {
- echo
- echo_info "$1"
- echo "CMD: ${RUN_CMD}"
-}
-
-if [ $# -eq 0 ]; then
- echo "Missing options!"
- help_info
- exit
-fi
-
-check_yn_rm_work () {
- yn="$1"
- case ${yn} in
- [Yy]|[Yy]es)
- RM_WORK="Yes"
- ;;
- [Nn]|[Nn]o)
- RM_WORK="No"
- ;;
- *)
- echo "Invalid arg for -r option."
- help_info
- exit 1
- ;;
- esac
-}
-
-check_valid_bsp () {
- bsp="$1"
- for b in ${SUPPORTED_BSP}; do
- if [ "${bsp}" == "${b}" ]; then
- BSP_VALID="${bsp}"
- break
- fi
- done
- if [ -z "${BSP_VALID}" ]; then
- echo_error "${bsp} is not a supported BSP, the supported BSPs are: ${SUPPORTED_BSP}"
- exit 1
- fi
-}
-
-DRYRUN=""
-EXTRA_CONF=""
-RM_WORK="Yes"
-BSP="intel-x86-64"
-IMAGE_TYPE="iso"
-
-while getopts "w:b:e:r:nh" OPTION; do
- case ${OPTION} in
- w)
- WORKSPACE=`readlink -f ${OPTARG}`
- ;;
- b)
- check_valid_bsp ${OPTARG}
- ;;
- e)
- EXTRA_CONF=`readlink -f ${OPTARG}`
- ;;
- n)
- DRYRUN="-n"
- ;;
- r)
- check_yn_rm_work ${OPTARG}
- ;;
- h)
- help_info
- exit
- ;;
- esac
-done
-
-if [ -z "${WORKSPACE}" ]; then
- echo_info "No workspace specified, a directory 'workspace' will be created in current directory as the workspace"
- WORKSPACE=`readlink -f workspace`
-fi
-
-if [ -n "${BSP_VALID}" ]; then
- BSP="${BSP_VALID}"
-fi
-
-# iso image is not supported by nxp-lx2xxx yet
-if [ "${BSP}" == "nxp-lx2xxx" ]; then
- IMAGE_TYPE="tar.bz2"
-fi
-
-SRC_WRL_DIR=${WORKSPACE}/src_wrlinux
-SRC_ORAN_DIR=${WORKSPACE}/src_oran
-PRJ_BUILD_DIR=${WORKSPACE}/prj_oran-inf
-
-mkdir -p ${SRC_WRL_DIR} ${PRJ_BUILD_DIR} ${SRC_ORAN_DIR}
-
-echo_info "The following directories are created in your workspace(${WORKSPACE}):"
-echo_info "For wrlinux source: ${SRC_WRL_DIR}"
-echo_info "For oran layer source: ${SRC_ORAN_DIR}"
-echo_info "For build project: ${PRJ_BUILD_DIR}"
-
-# Clone the source of WRLinux from github and setup
-RUN_CMD="git clone --branch ${SRC_WRL_BRANCH} ${SRC_WRL_URL}"
-echo_cmd "Cloning wrlinux-x source from github:"
-cd ${SRC_WRL_DIR}
-${RUN_CMD}
-
-RUN_CMD="./wrlinux-x/setup.sh --machines ${BSP} --layers meta-cloud-services"
-echo_cmd "Setup wrlinux build project:"
-${RUN_CMD}
-
-# Clone the oran layer if it's not already cloned
-# Check if the script is inside the repo
-if cd ${SCRIPTS_DIR} && git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
- CLONED_ORAN_REPO=`dirname ${SCRIPTS_DIR}`
- echo_info "Use the cloned oran repo: ${CLONED_ORAN_REPO}"
- mkdir ${SRC_ORAN_DIR}/rtp
- cd ${SRC_ORAN_DIR}/rtp
- ln -sf ${CLONED_ORAN_REPO}/meta-oran meta-oran
- ln -sf ${CLONED_ORAN_REPO}/scripts scripts
-else
- echo_info "Cloning oran layer:"
- cd ${SRC_ORAN_DIR}
- RUN_CMD="git clone --branch ${SRC_ORAN_BRANCH} https://gerrit.o-ran-sc.org/r/pti/rtp"
- echo_cmd "Cloing with:"
- ${RUN_CMD}
-fi
-
-# Apply meta patches for nxp-lx2xxx
-if [ "${BSP}" == "nxp-lx2xxx" ]; then
- cd ${SRC_WRL_DIR}/layers/nxp-lx2xxx/
- git am ${SRC_ORAN_DIR}/rtp/scripts/meta-patches/nxp-lx2xxx/0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch
-fi
-
-# Source the build env
-cd ${SRC_WRL_DIR}
-. ./environment-setup-x86_64-wrlinuxsdk-linux
-set ${PRJ_BUILD_DIR}
-. ./oe-init-build-env ${PRJ_BUILD_DIR}
-
-# Add the meta-oran layer
-cd ${PRJ_BUILD_DIR}
-RUN_CMD="bitbake-layers add-layer ${SRC_ORAN_DIR}/rtp/meta-oran"
-echo_cmd "Add the meta-oran layer into the build project"
-${RUN_CMD}
-
-# Add extra configs into local.conf
-cat << EOF >> conf/local.conf
-########################
-# Configs for oran-inf #
-########################
-DISTRO = "oran-inf"
-BB_NO_NETWORK = '0'
-
-# Work around for CI build
-IMAGE_INSTALL_remove = "ceph"
-
-# For container image
-WR_APP_CONTAINER_APP = "rt-tests"
-
-# Disable multilib fo nxp-lx2xxx
-MULTILIBS_nxp-lx2xxx = ""
-DEFAULTTUNE_virtclass-multilib-lib32_nxp-lx2xxx = ""
-
-# Add templates
-WRTEMPLATE += "${WRTEMPLATE_COMMON}"
-WRTEMPLATE_prepend_x86-64 += "${WRTEMPLATE_X86}"
-EOF
-
-if [ "${RM_WORK}" == "Yes" ]; then
- echo "INHERIT += 'rm_work'" >> conf/local.conf
-fi
-
-if [ "${EXTRA_CONF}" != "" ] && [ -f "${EXTRA_CONF}" ]; then
- cat ${EXTRA_CONF} >> conf/local.conf
-fi
-
-# Build the oran-inf-host image
-mkdir -p logs
-TIMESTAMP=`date +"%Y%m%d_%H%M%S"`
-RUN_CMD="bitbake ${DRYRUN} oran-image-inf-host"
-echo_cmd "Build the oran-image-inf-host image"
-bitbake ${DRYRUN} oran-image-inf-host 2>&1|tee logs/bitbake_oran-image-inf-host_${TIMESTAMP}.log
-
-RUN_CMD="bitbake ${DRYRUN} wr-app-container"
-echo_cmd "Build the wr-app-container image"
-bitbake ${DRYRUN} wr-app-container 2>&1|tee logs/bitbake_wr-app-container_${TIMESTAMP}.log
-
-echo_info "Build succeeded, you can get the image in ${PRJ_BUILD_DIR}/tmp-glibc/deploy/images/${BSP}/oran-image-inf-host-${BSP}.${IMAGE_TYPE}"