From: Jason Wessel <[email protected]> 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 <[email protected]> Signed-off-by: Bruce Ashfield <[email protected]> --- recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb | 6 +++--- .../oci-runtime-tools/oci-runtime-tools_git.bb | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb index 82f852f97583..deba7b3e19f3 100644 --- a/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb +++ b/recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb @@ -9,8 +9,8 @@ SRCNAME = "runtime-spec" PKG_NAME = "github.com/opencontainers/${SRCNAME}" SRC_URI = "git://${PKG_NAME}.git;destsuffix=git/src/${PKG_NAME}" -SRCREV = "4af0c72f92aacf1b43618d7986197d8209fadf0b" -PV = "v1.0.0-rc4+git${SRCPV}" +SRCREV = "a39b1cd4fdf7743ab721cc9da58abbee2f8624d1" +PV = "v1.0.0-rc6+git${SRCPV}" S = "${WORKDIR}/git" @@ -38,4 +38,4 @@ runtime_spec_file_sysroot_preprocess () { FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" -CLEANBROKEN = "1" \ No newline at end of file +CLEANBROKEN = "1" 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 4f77dced2ad5..a3f8e6656854 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 } -- 2.4.0.53.g8440f74 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
