From 8e66ab12fae2d477d0922f2be2c98b919c6beee8 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 16 Sep 2020 23:30:54 -0400
Subject: go-build: refresh to latest runX commit

Updating the go-build recipe to use the latest runX commit and
sync with the main recipe.

We also no longer need runc and recvtty so they are dropped from
the recipe.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../go/go-build/0001-build-use-instead-of-go.patch      | 17 +++++++----------
 recipes-devtools/go/go-build_git.bb                     |  9 +--------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/recipes-devtools/go/go-build/0001-build-use-instead-of-go.patch b/recipes-devtools/go/go-build/0001-build-use-instead-of-go.patch
index 36d45b57..873d7ab4 100644
--- a/recipes-devtools/go/go-build/0001-build-use-instead-of-go.patch
+++ b/recipes-devtools/go/go-build/0001-build-use-instead-of-go.patch
@@ -11,16 +11,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  gobuild/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/import/gobuild/Makefile b/src/import/gobuild/Makefile
-index 694d9ce..149d573 100644
---- a/src/import/gobuild/Makefile
-+++ b/src/import/gobuild/Makefile
-@@ -19,10 +19,10 @@ dep: ${GODEPPATHS}
+Index: git/src/import/gobuild/Makefile
+===================================================================
+--- git.orig/src/import/gobuild/Makefile
++++ git/src/import/gobuild/Makefile
+@@ -19,10 +19,10 @@
  
  ${GODEPPATHS}:
  	mkdir -p ${GOSRC}
--	GOPATH=${GOPATH} go get $(subst ${GOSRC}/,,$@)
-+	GOPATH=${GOPATH} ${GO} get $(subst ${GOSRC}/,,$@)
+-	GOPATH=${GOPATH} go get -d $(subst ${GOSRC}/,,$@)
++	GOPATH=${GOPATH} ${GO} get -d $(subst ${GOSRC}/,,$@)
  
  ${BIN}: ${GODEPPATHS} $(filter %/$@.go, ${MAIN})
 -	GOPATH=${GOPATH} ${ARCH} go build $(filter %/$@.go, ${MAIN})
@@ -28,6 +28,3 @@ index 694d9ce..149d573 100644
  
  clean:
  	rm -f   ${BIN}
--- 
-2.19.1
-
diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb
index 3ac86084..29d75984 100644
--- a/recipes-devtools/go/go-build_git.bb
+++ b/recipes-devtools/go/go-build_git.bb
@@ -2,12 +2,10 @@ HOMEPAGE = "https://github.com/lf-edge/runx"
 SUMMARY = "console for runx"
 DESCRIPTION = "Xen Runtime for OCI"
 
-SRCREV_runx = "da0c75c58ae5232d19b1791c33545db3225e1ea9"
-SRCREV_runc = "e4363b038787addfa12e8b0acf5417d4fba01693"
+SRCREV_runx = "f24efd33fb18469e9cfe4d1bfe8e2c90ec8c4e93"
 
 SRC_URI = "\
 	  git://github.com/lf-edge/runx;nobranch=1;name=runx \
-	  git://github.com/opencontainers/runc.git;nobranch=1;destsuffix=runc;name=runc \
           file://0001-build-use-instead-of-go.patch \
 	  "
 SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
@@ -34,9 +32,6 @@ do_compile() {
 
     export GOARCH="${TARGET_GOARCH}"
     cd ${S}/src/import/gobuild
-    mkdir -p go/src/github.com/opencontainers
-    ln -sf ${WORKDIR}/runc ${S}/src/import/gobuild/go/src/github.com/opencontainers/runc
-    export GOPATH="${S}/src/import/gobuild/go/src/github.com/opencontainers/runc"
 
     # Build the target binaries
     export GOARCH="${TARGET_GOARCH}"
@@ -57,8 +52,6 @@ do_install() {
 
     install -d ${D}${datadir}/runX
     install -m 755 ${B}/src/import/gobuild/serial_fd_handler ${D}${datadir}/runX/
-    install -m 755 ${B}/src/import/gobuild/recvtty ${D}${datadir}/runX/
- 
 }
 
 FILES_${PN} += "${datadir}/runX/*"
-- 
cgit v1.2.3-54-g00ecf