k8s: update to 1.20 release candidate

As part of this update:

  - we refresh our CC patch to apply cleanly
  - adjust the host side GO_LDFLAGS to drop linker flags that cgo
    doesn't like when building generated_files.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
index 62d05210..d27fc25a 100644
--- a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
+++ b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch
@@ -11,30 +11,27 @@ Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
  hack/lib/golang.sh | 4 ----
  1 file changed, 4 deletions(-)
 
-diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index c5d4634..563e2b4b 100755
---- a/src/import/hack/lib/golang.sh
-+++ b/src/import/hack/lib/golang.sh
-@@ -278,19 +278,15 @@ kube::golang::set_platform_envs() {
+Index: kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh
+===================================================================
+--- kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d.orig/src/import/hack/lib/golang.sh
++++ kubernetes-v1.20.0-rc.3+git98bc258bf5516b6c60860e06845b899eab29825d/src/import/hack/lib/golang.sh
+@@ -400,19 +400,15 @@
      case "${platform}" in
        "linux/arm")
          export CGO_ENABLED=1
--        export CC=arm-linux-gnueabihf-gcc
+-        export CC=${KUBE_LINUX_ARM_CC:-arm-linux-gnueabihf-gcc}
          ;;
        "linux/arm64")
          export CGO_ENABLED=1
--        export CC=aarch64-linux-gnu-gcc
+-        export CC=${KUBE_LINUX_ARM64_CC:-aarch64-linux-gnu-gcc}
          ;;
        "linux/ppc64le")
          export CGO_ENABLED=1
--        export CC=powerpc64le-linux-gnu-gcc
+-        export CC=${KUBE_LINUX_PPC64LE_CC:-powerpc64le-linux-gnu-gcc}
          ;;
        "linux/s390x")
          export CGO_ENABLED=1
--        export CC=s390x-linux-gnu-gcc
+-        export CC=${KUBE_LINUX_S390X_CC:-s390x-linux-gnu-gcc}
          ;;
      esac
    fi
--- 
-2.9.5
-
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb
index 1053d979..980943ab 100644
--- a/recipes-containers/kubernetes/kubernetes_git.bb
+++ b/recipes-containers/kubernetes/kubernetes_git.bb
@@ -5,11 +5,11 @@ applications across multiple hosts, providing basic mechanisms for deployment, \
 maintenance, and scaling of applications. \
 "
 
-PV = "v1.19.0-rc.3+git${SRCREV_kubernetes}"
-SRCREV_kubernetes = "bdc575e10c35a3e65a1c02bceea432832b7e4f4f"
+PV = "v1.20.0-rc.3+git${SRCREV_kubernetes}"
+SRCREV_kubernetes = "98bc258bf5516b6c60860e06845b899eab29825d"
 SRCREV_kubernetes-release = "e7fbf5b8b7e87ed1848cf3a0129f7a7dff2aa4ed"
 
-SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.19;name=kubernetes \
+SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.20;name=kubernetes \
            git://github.com/kubernetes/release;branch=master;name=kubernetes-release;destsuffix=git/release \
            file://0001-hack-lib-golang.sh-use-CC-from-environment.patch \
            file://0001-cross-don-t-build-tests-by-default.patch \
@@ -20,6 +20,7 @@ SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.19;name=k
 
 DEPENDS += "rsync-native \
             coreutils-native \
+            go-native \
            "
 
 LICENSE = "Apache-2.0"
@@ -48,7 +49,9 @@ do_compile() {
         export CFLAGS="${BUILD_CFLAGS}"
         export LDFLAGS="${BUILD_LDFLAGS}"
         export CGO_CFLAGS="${BUILD_CFLAGS}"
-        export CGO_LDFLAGS="${BUILD_LDFLAGS}"
+        # as of go 1.15.5, there are some flags the CGO doesn't like. Rather than
+        # clearing them all, we sed away the ones we don't want.
+        export CGO_LDFLAGS="$(echo ${BUILD_LDFLAGS} | sed 's/-Wl,-O1//g' | sed 's/-Wl,--dynamic-linker.*?( \|$\)//g')"
         export CC="${BUILD_CC}"
         export LD="${BUILD_LD}"