meta-stx: update LICENSE and copyright info

- Change License from Apache2 to MIT. - Remove Copyright from individual recipes - Move License to README.md - Add meta-stx Copyright to README.md Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
2020-06-08 12:54:45 -07:00 · 2020-06-08 12:54:45 -07:00 · 63b6601bdd
commit 63b6601bdd
parent 06d3729e78
415 changed files with 87 additions and 6163 deletions
--- a/209
+++ b/209
@ -1,209 +0,0 @@
 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.
                                 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.
--- a/README.md
+++ b/README.md
@ -1,52 +1,10 @@
-meta-starlingx
+meta-stx
 =========
 Build
 ------------------------
 ```
 git clone --branch warrior git@github.com:zbsarashki/staging-stx.git
 cd staging-stx
 ./setup.sh
 ```
 Introduction
 ------------------------
 This layer enables starlingx on poky. 
 meta-starlingx is an OpenEmbedded/Yocto® compatible layer for starlingx®
 Project 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.
 Introduction
 ------------------------
 This  layer provides the base for starlingx and akraino port to yocto thud.
 By itself, it provides set of generic recipes used by starlingx and akraino 
 but without starlingx and akraino patches.
 StarlingX modifications, enhancements and patches are in meta-stx.
 Akraino modifications, enhancements and patches are in meta-akraino.
 For further info: https://www.starlingx.io/
 Dependencies
@ -55,45 +13,60 @@ Dependencies
 This layer depends on:
 ```
 	 URI: git://git.yoctoproject.org/poky.git
 	 revision: HEAD
 	 branch: thud
 	URI: git://git.openembedded.org/meta-openembedded
 	branch: warrior
 	revision: HEAD
-	 branch: thud
+	layers:
 		openembedded-layer
 		filesystem-layer
 		meta-initramfs
 		networking-layer
 		perl-layer
 		meta-python
 		webserver
 	URI: git://git.yoctoproject.org/meta-virtualization
 	layer: virtualization-layer
 	branch: warrior
 	revision: HEAD
 	 branch: thud
 	URI: git://git.yoctoproject.org/meta-cloud-services
 	branch: warrior
 	revision: HEAD
-	 branch: thud
+	layers: cloud-services-layer
 		openstack-layer
 	 URI: git://git.yoctoproject.org/meta-selinux
 	 revision: HEAD
 	 branch: thud
 	 URI: git://git.yoctoproject.org/meta-security
 	 revision: HEAD
 	 branch: thud
 	 URI: https://github.com/jiazhang0/meta-secure-core.git
 	 revision: HEAD
 	 branch: thud
 	 URI: https://github.com/rauc/meta-rauc.git
 	 revision: HEAD
 	 branch: thud
 	URI: git://git.yoctoproject.org/meta-intel
 	layer: intel
 	branch: warrior
 	revision: HEAD
 	URI: git://git.yoctoproject.org/meta-security
 	layer: security
 	branch: warrior
 	revision: HEAD
 	URI: git://git.yoctoproject.org/meta-selinux
 	layer: selinux
 	branch: warrior
 	revision: HEAD
 	 branch: thud
 	URI: https://github.com/intel-iot-devkit/meta-iot-cloud.git
 	layer: iot-cloud
 	branch: warrior
 	revision: HEAD
 	URI: git://git.openembedded.org/meta-python2 
 	layer: meta-python2
 	branch: warrior
 	revision: HEAD
 	URI: https://git.yoctoproject.org/git/meta-dpdk
 	layer: dpdk
 	branch: warrior
 	revision: HEAD
 	 branch: thud
 ```
 You are solely responsible for determining the appropriateness of using or redistributing the above dependencies and assume any risks associated with your exercise of permissions under the license.
@ -105,80 +78,46 @@ Maintainer:
 Babak A. Sarashki
-Building the meta-stx layer
+Build:
 ---------------------------
 Setup workspace
 ```
-mkdir -p $P/workspace/{layers,build}
+git clone --branch warrior git@github.com:zbsarashki/staging-stx.git
-cd $P/workspace/layers
+cd staging-stx
-
+./setup.sh
 git clone --branch warrior git://git.yoctoproject.org/poky.git
 git clone --branch warrior git://git.openembedded.org/meta-openembedded
 git clone --branch warrior git://git.yoctoproject.org/meta-virtualization
 git clone --branch warrior git://git.yoctoproject.org/meta-cloud-services
 git clone --branch warrior git://git.yoctoproject.org/meta-security
 git clone --branch warrior git://git.yoctoproject.org/meta-intel
 git clone --branch warrior git://git.yoctoproject.org/meta-security
 git clone --branch warrior git://git.yoctoproject.org/meta-selinux
 git clone --branch warrior https://github.com/intel-iot-devkit/meta-iot-cloud.git
 git clone --branch warrior git://git.openembedded.org/meta-python2
 git clone --branch warrior https://git.yoctoproject.org/git/meta-dpdk
 git clone --branch warrior git@github.com:Wind-River/meta-stx.git
 git clone --branch warrior git@github.com:Wind-River/meta-stak-common.git
 ```
 Add the following layers to conf/bblayers.conf
 ```
 P=Path to workspace 
 cd $P/workspace/layers/poky
 source oe-init-build-env $P/workspace/build
 cat > conf/bblayers.conf << EOF
 # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
 POKY_BBLAYERS_CONF_VERSION = "2"
 BBPATH = "\${TOPDIR}"
 BBFILES ?= ""
 BBLAYERS ?= " \\
 $P/workspace/layers/poky/meta \\
 	$P/workspace/layers/poky/meta-poky \\
 	$P/workspace/layers/poky/meta-yocto-bsp \\
 	$P/workspace/layers/meta-openembedded/meta-oe \\
 	$P/workspace/layers/meta-openembedded/meta-networking \\
 	$P/workspace/layers/meta-openembedded/meta-filesystems \\
 	$P/workspace/layers/meta-openembedded/meta-perl \\
 	$P/workspace/layers/meta-openembedded/meta-python \\
 	$P/workspace/layers/meta-openembedded/meta-webserver \\
 	$P/workspace/layers/meta-openembedded/meta-initramfs \\
 	$P/workspace/layers/meta-virtualization \\
 	$P/workspace/layers/meta-cloud-services \\
 	$P/workspace/layers/meta-cloud-services/meta-openstack \\
 	$P/workspace/layers/meta-intel \\
 	$P/workspace/layers/meta-security \\
 	$P/workspace/layers/meta-security/meta-security-compliance \\
 	$P/workspace/layers/meta-selinux \\
 	$P/workspace/layers/meta-iot-cloud \\
 	$P/workspace/layers/meta-python2 \\
 	$P/workspace/layers/meta-dpdk \\
 	$P/workspace/layers/meta-stx \\
 	$P/workspace/layers/meta-stak-common \\
 	"
 EOF
 	sed -i -e 's/^\(#MACHINE.*\"qemuarm\"\)/MACHINE \?= \"intel-corei7-64\"\n\1/g' conf/local.conf
 	echo 'PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"' >> conf/local.conf
 ```
 Use Case:
 ---------------------------
 License
 -------
 Copyright (C) 2019 Wind River Systems, Inc.
 Source code included in tree for individual recipes is under the LICENSE
 stated in each recipe (.bb file) unless otherwise stated.
 The metadata is under the following license unless otherwise stated.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 # Legal Notices
 All product names, logos, and brands are property of their respective owners. All company, product and service names used in this software are for identification purposes only. Wind River is a registered trademarks of Wind River Systems, Inc. Linux is a registered trademark of Linus Torvalds.
--- a/meta-stx-cloud/conf/layer.conf
+++ b/meta-stx-cloud/conf/layer.conf
@ -1,17 +1,3 @@
 #
 ## 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}"
--- a/meta-stx-cloud/recipes-connectivity/qpid/qpid-proton_0.28.0.bb
+++ b/meta-stx-cloud/recipes-connectivity/qpid/qpid-proton_0.28.0.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Qpid Proton is a high-performance, lightweight messaging library."
 LICENSE = "Apache-2.0"
--- a/meta-stx-cloud/recipes-connectivity/qpid/qpid_0.20.bbappend
+++ b/meta-stx-cloud/recipes-connectivity/qpid/qpid_0.20.bbappend
@ -1,17 +1,3 @@
 #
 # 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:"
 SRC_URI += "file://fix-compile-through-disable-cflag-werror.patch"
--- a/meta-stx-cloud/recipes-devtools/erlang/erlang-native_R16B03-1.bbappend
+++ b/meta-stx-cloud/recipes-devtools/erlang/erlang-native_R16B03-1.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-devtools/erlang/erlang_R16B03-1.bbappend
+++ b/meta-stx-cloud/recipes-devtools/erlang/erlang_R16B03-1.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/openstack-dashboard-httpd-2.4.conf
+++ b/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/openstack-dashboard-httpd-2.4.conf
@ -1,17 +1,3 @@
 #
 ## 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.
 WSGIDaemonProcess dashboard
 WSGIProcessGroup dashboard
--- a/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/openstack-dashboard-httpd-logging.conf
+++ b/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/openstack-dashboard-httpd-logging.conf
@ -1,17 +1,3 @@
 #
 ## 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.
 # if you want logging to a separate file, please update your config 
 # according to the last 4 lines in this snippet, and also take care
--- a/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/python-django-horizon-logrotate.conf
+++ b/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/python-django-horizon-logrotate.conf
@ -1,17 +1,3 @@
 #
 ## 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.
 /var/log/horizon/*.log {
    weekly
--- a/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/python-django-horizon-systemd.conf
+++ b/meta-stx-cloud/recipes-devtools/python/files/python-django-horizon/python-django-horizon-systemd.conf
@ -1,17 +1,3 @@
 #
 ## 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.
 [Service]
 ExecStartPre=/usr/bin/python /usr/share/openstack-dashboard/manage.py collectstatic --noinput --clear
--- a/meta-stx-cloud/recipes-devtools/python/python-ansible_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-ansible_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 HOMEPAGE = "https://github.com/ansible/ansible/"
 SECTION = "devel/python"
--- a/meta-stx-cloud/recipes-devtools/python/python-backports-functools-lru-cache_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-backports-functools-lru-cache_%.bbappend
@ -1,16 +1,2 @@
 #
 ## 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 python-backports-init
--- a/meta-stx-cloud/recipes-devtools/python/python-backports-ssl_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-backports-ssl_%.bbappend
@ -1,16 +1,2 @@
 #
 ## 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 python-backports-init
--- a/meta-stx-cloud/recipes-devtools/python/python-boto3.inc
+++ b/meta-stx-cloud/recipes-devtools/python/python-boto3.inc
@ -1,17 +1,3 @@
 #
 ## 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 = "The AWS SDK for Python"
 HOMEPAGE = "https://aws.amazon.com/sdk-for-python/"
--- a/meta-stx-cloud/recipes-devtools/python/python-boto3_1.10.25.bb
+++ b/meta-stx-cloud/recipes-devtools/python/python-boto3_1.10.25.bb
@ -1,17 +1,3 @@
 #
 ## 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 setuptools
 require python-boto3.inc
--- a/meta-stx-cloud/recipes-devtools/python/python-cffi_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-cffi_%.bbappend
@ -1,16 +1,2 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " python-pycparser"
--- a/meta-stx-cloud/recipes-devtools/python/python-django-horizon_15.1.0.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-django-horizon_15.1.0.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-devtools/python/python-eventlet_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-eventlet_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-devtools/python/python-hgtools_6.3.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-hgtools_6.3.bbappend
@ -1,16 +1,2 @@
 #
 ## 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.
 BBCLASSEXTEND_append = " native nativesdk"
--- a/meta-stx-cloud/recipes-devtools/python/python-keyring_5.3.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-keyring_5.3.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-devtools/python/python-keystoneclient_git.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-keystoneclient_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 SRC_URI = "\
 	git://github.com/openstack/python-keystoneclient.git;branch=stable/rocky \
--- a/meta-stx-cloud/recipes-devtools/python/python-kombu_4.6.7.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-kombu_4.6.7.bbappend
@ -1,16 +1,2 @@
 #
 ## 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.
 RDEPENDS_${PN} += "python-importlib-metadata"
--- a/meta-stx-cloud/recipes-devtools/python/python-lefthandclient_2.1.0.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-lefthandclient_2.1.0.bbappend
@ -1,16 +1,2 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " python-paramiko"
--- a/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " python-munch"
 RDEPENDS_${PN}_append = " python2-os-service-types"
--- a/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_git.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN} += " bash"
 PV = "0.25.0+git${SRCPV}"
--- a/meta-stx-cloud/recipes-devtools/python/python-oslo.utils_git.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-oslo.utils_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 PV = "3.33.0+git${SRCPV}"
 SRCREV = "58fb709f58bd031c5114d9b6fe2e0926175b87b6"
--- a/meta-stx-cloud/recipes-devtools/python/python-paramiko_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-paramiko_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	python-bcrypt \
--- a/meta-stx-cloud/recipes-devtools/python/python-pecan_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-pecan_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	${PYTHON_PN}-singledispatch \
--- a/meta-stx-cloud/recipes-devtools/python/python-requests-oauthlib_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-requests-oauthlib_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	python-oauthlib \
--- a/meta-stx-cloud/recipes-devtools/python/python-requests_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-requests_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-devtools/python/python-sphinx_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-sphinx_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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 python-dir
 RDEPENDS_${PN}_append = " \
--- a/meta-stx-cloud/recipes-devtools/python/python-testtools_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-testtools_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	python-mimeparse \
--- a/meta-stx-cloud/recipes-devtools/python/python-unittest2_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-unittest2_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-devtools/python/python-urllib3_1.23.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-urllib3_1.23.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 PV="1.21.1"
--- a/meta-stx-cloud/recipes-devtools/python/python-websocket-client_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-websocket-client_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	${PYTHON_PN}-backports-ssl \
--- a/meta-stx-cloud/recipes-devtools/python/python-websockify_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-websockify_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	python-numpy \
--- a/meta-stx-cloud/recipes-devtools/python/python-webtest_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-webtest_%.bbappend
@ -1,16 +1,2 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " python-waitress"
--- a/meta-stx-cloud/recipes-devtools/python/python-wsme_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-wsme_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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.
 RDEPENDS_${PN}_append = " \
 	${PYTHON_PN}-simplegeneric \
--- a/meta-stx-cloud/recipes-devtools/python/python3-mako_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python3-mako_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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_install_append() {
 	mv ${D}/${bindir}/mako-render ${D}/${bindir}/mako3-render 
--- a/meta-stx-cloud/recipes-devtools/ruby-shadow/ruby-shadow_%.bbappend
+++ b/meta-stx-cloud/recipes-devtools/ruby-shadow/ruby-shadow_%.bbappend
@ -1,16 +1,2 @@
 #
 ## 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 openssl10
--- a/meta-stx-cloud/recipes-devtools/ruby-shadow/ruby-shadow_git.bbappend
+++ b/meta-stx-cloud/recipes-devtools/ruby-shadow/ruby-shadow_git.bbappend
@ -1,16 +1,2 @@
 #
 ## 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.
 DEPENDS += " libxcrypt"
--- a/meta-stx-cloud/recipes-extended/cloud-init/cloud-init_0.7.6.bbappend
+++ b/meta-stx-cloud/recipes-extended/cloud-init/cloud-init_0.7.6.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-extended/rabbitmq/rabbitmq-server_3.6.5.bb
+++ b/meta-stx-cloud/recipes-extended/rabbitmq/rabbitmq-server_3.6.5.bb
@ -1,17 +1,3 @@
 #
 ## 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 = "High-performance AMQP-compliant message broker written in Erlang."
 HOMEPAGE = "http://www.rabbitmq.com/"
--- a/meta-stx-cloud/recipes-extended/registry-token-server/files/token_server.conf
+++ b/meta-stx-cloud/recipes-extended/registry-token-server/files/token_server.conf
@ -1,16 +1,2 @@
 #
 ## 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.
 # This is a puppet managed config file
--- a/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_1.0.0.bb
+++ b/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_1.0.0.bb
@ -1,17 +1,3 @@
 #
 # 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 = " Token server for use with Docker registry with Openstack Keystone back end"
 LICENSE = "Apache-2.0"
--- a/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_git.bb
+++ b/meta-stx-cloud/recipes-extended/registry-token-server/registry-token-server_git.bb
@ -1,17 +1,3 @@
 #
 ## 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 = "StarlingX distributedcloud packages collection"
 HOMEPAGE = "https://opendev.org/starlingx"
--- a/meta-stx-cloud/recipes-extended/uwsgi/uwsgi_git.bbappend
+++ b/meta-stx-cloud/recipes-extended/uwsgi/uwsgi_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents_4.0.1.bb
+++ b/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents_4.0.1.bb
@ -1,17 +1,3 @@
 #
 # 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 = "OCF resource agents for use by compatible cluster managers"
 DESCRIPTION = "A set of scripts to interface with several services \
--- a/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents_4.0.1.bbappend
+++ b/meta-stx-cloud/recipes-support/cluster-resource-agents/resource-agents_4.0.1.bbappend
@ -1,17 +1,3 @@
 #
 ## 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 update-alternatives
 ALTERNATIVE_PRIORITY = "70"
--- a/meta-stx-cloud/recipes-support/facter/facter_2.5.0.bbappend
+++ b/meta-stx-cloud/recipes-support/facter/facter_2.5.0.bbappend
@ -1,17 +1,3 @@
 #
 ## 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_append := ":${THISDIR}/files:"
--- a/meta-stx-cloud/recipes-support/hiera/hiera_%.bbappend
+++ b/meta-stx-cloud/recipes-support/hiera/hiera_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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 openssl10
 DEPENDS_append = " openssl"
--- a/meta-stx-cloud/recipes-support/ldapscripts/ldapscripts_2.0.8.bb
+++ b/meta-stx-cloud/recipes-support/ldapscripts/ldapscripts_2.0.8.bb
@ -1,17 +1,3 @@
 #
 ## 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 = " \
 The ldapscripts are originally designed to be used within Samba 3.x's \
--- a/meta-stx-cloud/recipes-support/mod-wsgi/mod-wsgi_git.bbappend
+++ b/meta-stx-cloud/recipes-support/mod-wsgi/mod-wsgi_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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_install_append() {
 	sed -i -e 's|${libdir}|${libexecdir}|' ${D}/etc/apache2/modules.d/wsgi.load
--- a/meta-stx-cloud/recipes-support/nss-pam-ldapd/nss-pam-ldapd_%.bbappend
+++ b/meta-stx-cloud/recipes-support/nss-pam-ldapd/nss-pam-ldapd_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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 useradd
--- a/meta-stx-cloud/recipes-support/openstack-barbican-api/files/barbican.conf
+++ b/meta-stx-cloud/recipes-support/openstack-barbican-api/files/barbican.conf
@ -1,17 +1,3 @@
 #
 ## 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.
 [DEFAULT]
--- a/meta-stx-cloud/recipes-support/openstack-barbican-api/files/gunicorn-config.py
+++ b/meta-stx-cloud/recipes-support/openstack-barbican-api/files/gunicorn-config.py
@ -1,18 +1,3 @@
 #
 # 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.
 import multiprocessing
 bind = '0.0.0.0:9311'
 user = 'barbican'
--- a/meta-stx-cloud/recipes-support/openstack-barbican-api/openstack-barbican-api.bb
+++ b/meta-stx-cloud/recipes-support/openstack-barbican-api/openstack-barbican-api.bb
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-support/os-service-types/python2-os-service-types_1.3.0.bb
+++ b/meta-stx-cloud/recipes-support/os-service-types/python2-os-service-types_1.3.0.bb
@ -1,17 +1,3 @@
 #
 # 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 = "A library to handle official service types for OpenStack and their historical aliases."
 HOMEPAGE = "https://opendev.org/openstack/os-service-types"
--- a/meta-stx-cloud/recipes-support/puppet/files/puppet/4.8.2/puppet.conf
+++ b/meta-stx-cloud/recipes-support/puppet/files/puppet/4.8.2/puppet.conf
@ -1,17 +1,3 @@
 #
 ## 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.
 [main]
 logdir=/var/log/puppet
--- a/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Puppet module for OpenStack Barbican"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-barbican_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-boolean_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-boolean_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Logical Resource Management (LVM) features for Puppet."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-ceph_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-ceph_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Community Developed Ceph Module."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-ceph_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-ceph_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-certmonger_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-certmonger_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Deprecated: Use saltedsignal/puppet-certmonger instead."
 DESCRIPTION = " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-certmonger_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-certmonger_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-collectd_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-collectd_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Puppet module for configuring collectd and plugins."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-dnsmasq_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-dnsmasq_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "puppet module for dnsmasq"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-dnsmasq_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-dnsmasq_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-drbd_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-drbd_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "puppet-drbd"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-drbd_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-drbd_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-etcd_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-etcd_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Installs and configures etcd"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-etcd_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-etcd_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-filemapper_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-filemapper_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "A Puppet module to map files to resources and back."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Intended managing the entirety of horizon."
 DESCRIPTION = " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-horizon_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Puppet module for OpenStack Keystone"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-keystone_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-kmod_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-kmod_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Manage Linux kernel modules with Puppet"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-ldap_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-ldap_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "OpenLDAP module for Puppet."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-ldap_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-ldap_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-memcached_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-memcached_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Intended managing the entirety of horizon."
 DESCRIPTION = " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "A Puppet module to manage non volatile network and route configuration."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-network_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-nslcd_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-nslcd_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "A Puppet module to manage the nslcd daemon which provides authentication via LDAP"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-nslcd_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-nslcd_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-nssdb_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-nssdb_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "NSS database Puppet Module"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Puppet OpenStack Libraries."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-openstacklib_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "The oslo module is a part of OpenStack intended to provide continuous integration testing and code review."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-oslo_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-puppi_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-puppi_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Installs and configures Puppi."
 DESCRIPTION = " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-puppi_git.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-puppi_git.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/meta-stx-cloud/recipes-support/puppet/puppet-staging_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-staging_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Manages staging directory, along with download/extraction of compressed files."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-sysctl_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-sysctl_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "This modules allows you to configure sysctl."
--- a/meta-stx-cloud/recipes-support/puppet/puppet-vlan_git.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-vlan_git.bb
@ -1,17 +1,3 @@
 #
 # 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 = "Puppet module for OpenStack Barbican"
--- a/meta-stx-cloud/recipes-support/puppet/puppet-vswitch_%.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet-vswitch_%.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 do_install_append() {
--- a/meta-stx-cloud/recipes-support/puppet/puppet_4.8.2.bb
+++ b/meta-stx-cloud/recipes-support/puppet/puppet_4.8.2.bb
@ -1,17 +1,3 @@
 #
 ## 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 = "Open source Puppet is a configuration management system"
 HOMEPAGE = "https://puppetlabs.com/puppet/puppet-open-source"
--- a/meta-stx-cloud/recipes-support/puppet/puppet_5.4.0.bbappend
+++ b/meta-stx-cloud/recipes-support/puppet/puppet_5.4.0.bbappend
@ -1,17 +1,3 @@
 #
 ## 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:"
 SRC_URI += " \
--- a/Show More
+++ b/Show More