Patch to release inf image for Bronze release

[pti/rtp.git] / meta-oran / recipes-containers / kubernetes-plugins / flannel_0.11.0.bb

diff --git a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb b/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb
index a6b330b..539aa8a 100644 (file)
--- a/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb
+++ b/meta-oran/recipes-containers/kubernetes-plugins/flannel_0.11.0.bb
@@ -1,6 +1,17 @@
 #
 # Copyright (C) 2019 Wind River Systems, Inc.
 #
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
 
 SUMMARY = "Flannel is a simple and easy way to configure a layer 3 network fabric designed for Kubernetes."
 DESCRIPTION = "\
@@ -19,7 +30,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "\
     https://github.com/coreos/flannel/archive/v${PV}.tar.gz;downloadfilename=${BPN}-v${PV}.tar.gz \
-    file://docker-img-flannel-v0.11.0.tar.bz2;unpack=0 \
 "
 
 SRC_URI[md5sum] = "e023f76c688fd74dce6c0c8df8bea5d7"
@@ -27,9 +37,6 @@ SRC_URI[sha256sum] = "476c886ddc06a8afcf54e181ac55579224c6be424089567a0b8d9e93dd
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-PACKAGES =+ "${PN}-img"
-
-DOCKER_IMG = "/opt/docker_images/${BPN}"
 K8S_PLUGINS = "${sysconfdir}/kubernetes/plugins/${BPN}"
 
 do_install() {
@@ -37,10 +44,4 @@ do_install() {
     install -m 644 ${S}/README.md ${D}${K8S_PLUGINS}
     install -m 644 ${S}/Documentation/kube-flannel.yml ${D}${K8S_PLUGINS}
     sed -i -e 's/v0.10.0/v0.11.0/' ${D}${K8S_PLUGINS}/kube-flannel.yml
-
-    # Install the saved docker image
-    install -d ${D}${DOCKER_IMG}
-    install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG}
 }
-
-FILES_${PN}-img = "${DOCKER_IMG}"