MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

go-build: refresh to latest runX commit

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2020-09-16 23:30:54 -04:00
parent 2f22425222
commit 8e66ab12fa
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-devtools/go/go-build/0001-build-use-instead-of-go.patch
View File

@ -11,16 +11,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
gobuild/Makefile | 4 ++-- gobuild/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/import/gobuild/Makefile b/src/import/gobuild/Makefile Index: git/src/import/gobuild/Makefile
index 694d9ce..149d573 100644 ===================================================================
--- a/src/import/gobuild/Makefile --- git.orig/src/import/gobuild/Makefile
+++ b/src/import/gobuild/Makefile +++ git/src/import/gobuild/Makefile
@@ -19,10 +19,10 @@ dep: ${GODEPPATHS} @@ -19,10 +19,10 @@
${GODEPPATHS}: ${GODEPPATHS}:
mkdir -p ${GOSRC} mkdir -p ${GOSRC}
- GOPATH=${GOPATH} go get $(subst ${GOSRC}/,,$@) - GOPATH=${GOPATH} go get -d $(subst ${GOSRC}/,,$@)
+ GOPATH=${GOPATH} ${GO} get $(subst ${GOSRC}/,,$@) + GOPATH=${GOPATH} ${GO} get -d $(subst ${GOSRC}/,,$@)
${BIN}: ${GODEPPATHS} $(filter %/$@.go, ${MAIN}) ${BIN}: ${GODEPPATHS} $(filter %/$@.go, ${MAIN})
- GOPATH=${GOPATH} ${ARCH} go build $(filter %/$@.go, ${MAIN}) - GOPATH=${GOPATH} ${ARCH} go build $(filter %/$@.go, ${MAIN})
@ -28,6 +28,3 @@ index 694d9ce..149d573 100644
clean: clean:
rm -f ${BIN} rm -f ${BIN}
--
2.19.1

9
recipes-devtools/go/go-build_git.bb
View File

@ -2,12 +2,10 @@ HOMEPAGE = "https://github.com/lf-edge/runx"
SUMMARY = "console for runx" SUMMARY = "console for runx"
DESCRIPTION = "Xen Runtime for OCI" DESCRIPTION = "Xen Runtime for OCI"
SRCREV_runx = "da0c75c58ae5232d19b1791c33545db3225e1ea9" SRCREV_runx = "f24efd33fb18469e9cfe4d1bfe8e2c90ec8c4e93"
SRCREV_runc = "e4363b038787addfa12e8b0acf5417d4fba01693"
SRC_URI = "\ SRC_URI = "\
git://github.com/lf-edge/runx;nobranch=1;name=runx \ 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 \ file://0001-build-use-instead-of-go.patch \
" "
SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
@ -34,9 +32,6 @@ do_compile() {
export GOARCH="${TARGET_GOARCH}" export GOARCH="${TARGET_GOARCH}"
cd ${S}/src/import/gobuild 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 # Build the target binaries
export GOARCH="${TARGET_GOARCH}" export GOARCH="${TARGET_GOARCH}"
@ -57,8 +52,6 @@ do_install() {
install -d ${D}${datadir}/runX 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/serial_fd_handler ${D}${datadir}/runX/
install -m 755 ${B}/src/import/gobuild/recvtty ${D}${datadir}/runX/
} }
FILES_${PN} += "${datadir}/runX/*" FILES_${PN} += "${datadir}/runX/*"