[meta-virtualization] [PATCH] containered|runc: override GOROOT at build time

[Bruce Ashfield]

merged.

Bruce

On Sat, Jan 21, 2017 at 12:37 AM, Lans Zhang <jia.zhang at windriver.com>
wrote:

> Similar to commit 01aa8f1, runc and containered also need to set GOROOT
> explicitly.
>
> Signed-off-by: Lans Zhang <jia.zhang at windriver.com>
> ---
>  recipes-containers/containerd/containerd_git.bb | 1 +
>  recipes-containers/runc/runc_git.bb             | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/recipes-containers/containerd/containerd_git.bb
> b/recipes-containers/containerd/containerd_git.bb
> index ca99e55..096a164 100644
> --- a/recipes-containers/containerd/containerd_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -44,6 +44,7 @@ do_compile() {
>         mkdir -p .gopath/src/"$(dirname "${CONTAINERD_PKG}")"
>         ln -sf ../../../.. .gopath/src/"${CONTAINERD_PKG}"
>         export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/$
> {prefix}/local/go"
> +       export GOROOT="${STAGING_DIR_NATIVE}/
> ${nonarch_libdir}/${HOST_SYS}/go"
>         cd -
>
>         # Pass the needed cflags/ldflags so that cgo
> diff --git a/recipes-containers/runc/runc_git.bb
> b/recipes-containers/runc/runc_git.bb
> index 905a751..ed9a32e 100644
> --- a/recipes-containers/runc/runc_git.bb
> +++ b/recipes-containers/runc/runc_git.bb
> @@ -43,6 +43,7 @@ do_compile() {
>
>         (cd .gopath/src/${dname}; ln -sf ../../../../../${bname} ${bname})
>         export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/$
> {prefix}/local/go"
> +       export GOROOT="${STAGING_DIR_NATIVE}/
> ${nonarch_libdir}/${HOST_SYS}/go"
>         cd -
>
>         # Pass the needed cflags/ldflags so that cgo
> --
> 2.7.4
>
>


-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/meta-virtualization/attachments/20170121/532bc719/attachment-0001.html>