recipes-containers: inherit go112

Issue-ID: INF-4
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I51999bdd5f6caa386f1c3646f06637da72a3140a

diff --git a/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend b/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend
index a0790b8..8f94bab 100644 (file)
--- a/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend
+++ b/meta-oran/recipes-containers/containerd/containerd-opencontainers_git.bbappend
@@ -2,4 +2,4 @@
 # Copyright (C) 2019 Wind River Systems, Inc.
 #
 
-inherit ${@bb.utils.contains('GOVERSION', '1.2.%', 'go112', '', d)}
+inherit go112

diff --git a/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend b/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend
index a0790b8..8f94bab 100644 (file)
--- a/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend
+++ b/meta-oran/recipes-containers/docker-distribution/docker-distribution_git.bbappend
@@ -2,4 +2,4 @@
 # Copyright (C) 2019 Wind River Systems, Inc.
 #
 
-inherit ${@bb.utils.contains('GOVERSION', '1.2.%', 'go112', '', d)}
+inherit go112

diff --git a/meta-oran/recipes-containers/docker/docker_%.bbappend b/meta-oran/recipes-containers/docker/docker_%.bbappend
index 281e0ed..e8d9c4f 100644 (file)
--- a/meta-oran/recipes-containers/docker/docker_%.bbappend
+++ b/meta-oran/recipes-containers/docker/docker_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-inherit ${@bb.utils.contains('GOVERSION', '1.2.%', 'go112', '', d)}
+inherit go112
 
 do_install_append() {
     sed -i '/ExecStart=/a ExecStartPost=/usr/sbin/iptables -P FORWARD ACCEPT' ${D}${systemd_unitdir}/system/docker.service

diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
index 24e3537..a3aef39 100644 (file)
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
+++ b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
@@ -8,4 +8,4 @@ PV = "1.15.2+git${SRCREV_kubernetes}"
 SRCREV_kubernetes = "f6278300bebbb750328ac16ee6dd3aa7d3549568"
 SRC_BRANCH = "release-1.15"
 
-inherit ${@bb.utils.contains('GOVERSION', '1.2.%', 'go112', '', d)}
+inherit go112

diff --git a/meta-oran/recipes-containers/runc/runc-docker_git.bbappend b/meta-oran/recipes-containers/runc/runc-docker_git.bbappend
index a0790b8..8f94bab 100644 (file)
--- a/meta-oran/recipes-containers/runc/runc-docker_git.bbappend
+++ b/meta-oran/recipes-containers/runc/runc-docker_git.bbappend
@@ -2,4 +2,4 @@
 # Copyright (C) 2019 Wind River Systems, Inc.
 #
 
-inherit ${@bb.utils.contains('GOVERSION', '1.2.%', 'go112', '', d)}
+inherit go112

diff --git a/meta-oran/recipes-networking/cni/cni_git.bbappend b/meta-oran/recipes-networking/cni/cni_git.bbappend
index 5f3f912..97ba2e5 100644 (file)
--- a/meta-oran/recipes-networking/cni/cni_git.bbappend
+++ b/meta-oran/recipes-networking/cni/cni_git.bbappend
@@ -2,7 +2,7 @@
 # Copyright (C) 2019 Wind River Systems, Inc.
 #
 
-inherit ${@bb.utils.contains('GOVERSION', '1.2.%', 'go112', '', d)}
+inherit go112
 
 do_compile_append() {
     # build ipam plugins