diff options
Diffstat (limited to 'recipes-devtools/go/go-build_git.bb')
| -rw-r--r-- | recipes-devtools/go/go-build_git.bb | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb index e057b6d7..75ea40a8 100644 --- a/recipes-devtools/go/go-build_git.bb +++ b/recipes-devtools/go/go-build_git.bb @@ -2,12 +2,14 @@ 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" +SRCREV_runc = "1e7bb5b773162b57333d57f612fd72e3f8612d94" +SRCREV_FORMAT = "runx_runc" SRC_URI = "\ - git://github.com/lf-edge/runx;nobranch=1;name=runx \ - git://github.com/opencontainers/runc.git;nobranch=1;destsuffix=runc;name=runc \ + git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \ + git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc \ + file://0001-build-use-instead-of-go.patch \ " SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769" @@ -27,24 +29,33 @@ inherit pkgconfig GO_IMPORT = "import" inherit go -RDEPENDS_${PN}-dev = "bash" +RDEPENDS:${PN}-dev = "bash" do_compile() { export GOARCH="${TARGET_GOARCH}" cd ${S}/src/import/gobuild - mkdir -p go/src/github.com/opencontainers - ln -s ${WORKDIR}/runc ${S}/src/import/gobuild/go/src/github.com/opencontainers/runc - export GOPATH="${S}/src/import/gobuild/go/src/github.com/opencontainers/runc" - oe_runmake + + # Build the target binaries + export GOARCH="${TARGET_GOARCH}" + # Pass the needed cflags/ldflags so that cgo can find the needed headers files and libraries + export CGO_ENABLED="1" + export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CFLAGS="" + export LDFLAGS="" + export CC="${CC}" + export LD="${LD}" + export GOBIN="" + export GO111MODULE=off + + oe_runmake GO=${GO} } 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/*" +FILES:${PN} += "${datadir}/runX/*" |