diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb')
-rw-r--r-- | import-layers/meta-virtualization/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/import-layers/meta-virtualization/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb index 4f77dced2a..61b68b5ffc 100644 --- a/import-layers/meta-virtualization/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb +++ b/import-layers/meta-virtualization/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb @@ -1,14 +1,17 @@ HOMEPAGE = "https://github.com/opencontainers/runtime-tools" SUMMARY = "oci-runtime-tool is a collection of tools for working with the OCI runtime specification" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b355a61a394a504dacde901c958f662c" +LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f662c" -SRC_URI = "git://github.com/opencontainers/runtime-tools.git" +SRC_URI = "git://github.com/opencontainers/runtime-tools.git \ + file://0001-Revert-implement-add-set-function-for-hooks-items.patch \ + " -SRCREV = "038b0c99b82f3c08de31f6b09e693eb24644affd" -PV = "0.0.1+git${SRCPV}" +SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb" +PV = "0.1.0+git${SRCPV}" +GO_IMPORT = "import" -S = "${WORKDIR}/git" +INSANE_SKIP_${PN} += "ldflags" inherit goarch inherit go @@ -16,7 +19,7 @@ inherit go do_compile() { export GOARCH="${TARGET_GOARCH}" export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" - export GOPATH="${S}" + export GOPATH="${S}/src/import:${S}/src/import/vendor" # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries @@ -26,10 +29,24 @@ 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}/src/import/vendor/src + ln -sf ./ ${S}/src/import/vendor/src + mkdir -p ${S}/src/import/vendor/github.com/opencontainers/runtime-tools + ln -sf ../../../../generate ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/generate + ln -sf ../../../../validate ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/validate + ln -sf ../../../../cmd ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/cmd + ln -sf ../../../../error ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/error + ln -sf ../../../../specerror ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/specerror + cd ${S}/src/import + oe_runmake } do_install() { install -d ${D}/${sbindir} - install ${S}/oci-runtime-tool ${D}/${sbindir}/oci-runtime-tool + install ${S}/src/import/oci-runtime-tool ${D}/${sbindir}/oci-runtime-tool } + +deltask compile_ptest_base + |