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

oci-runtime-tools, oci-runtime-spec: Uprev to runc 1.0-rc3 versions

Browse Source 
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 <jason.wessel@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Jason Wessel 2017-07-13 10:09:06 -07:00 committed by Bruce Ashfield
parent cc3d8b9268
commit a31f735bda
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
View File

@ -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"

12
recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
View File

@ -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
}