From a31f735bda504fd951b4b284a41fc4d6d154fa5e Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 13 Jul 2017 10:09:06 -0700 Subject: oci-runtime-tools, oci-runtime-spec: Uprev to runc 1.0-rc3 versions The config.json has elements which have changed in the latest runc. These changes are not backward compatible with older versions of runc. Signed-off-by: Jason Wessel Signed-off-by: Bruce Ashfield --- .../oci-runtime-tools/oci-runtime-tools_git.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'recipes-containers/oci-runtime-tools') diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb index 4f77dced..a3f8e665 100644 --- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb +++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b355a61a394a504dacde901c958f662c" SRC_URI = "git://github.com/opencontainers/runtime-tools.git" -SRCREV = "038b0c99b82f3c08de31f6b09e693eb24644affd" +SRCREV = "15ec1df3f6607f4223ab3915547c184cf60a30dd" PV = "0.0.1+git${SRCPV}" S = "${WORKDIR}/git" @@ -16,7 +16,7 @@ inherit go do_compile() { export GOARCH="${TARGET_GOARCH}" export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" - export GOPATH="${S}" + export GOPATH="${S}:${S}/vendor" # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries @@ -26,6 +26,14 @@ do_compile() { export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + # link fixups for compilation + rm -f ${S}/vendor/src + ln -sf ./ ${S}/vendor/src + mkdir -p ${S}/vendor/github.com/opencontainers/runtime-tools + ln -sf ../../../../generate ${S}/vendor/github.com/opencontainers/runtime-tools/generate + ln -sf ../../../../validate ${S}/vendor/github.com/opencontainers/runtime-tools/validate + ln -sf ../../../../cmd ${S}/vendor/github.com/opencontainers/runtime-tools/cmd + oe_runmake } -- cgit v1.2.3-54-g00ecf