diff options
Diffstat (limited to 'recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb')
| -rw-r--r-- | recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | 48 |
1 files changed, 24 insertions, 24 deletions
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 7f194027..81bebfe2 100644 --- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb +++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb @@ -1,53 +1,53 @@ 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://src/import/LICENSE;md5=b355a61a394a504dacde901c958f662c" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b355a61a394a504dacde901c958f662c" -SRC_URI = "git://github.com/opencontainers/runtime-tools.git \ - file://0001-Revert-implement-add-set-function-for-hooks-items.patch \ +SRC_URI = "git://github.com/opencontainers/runtime-tools.git;branch=master;protocol=https;destsuffix=git/src/github.com/opencontainers/runtime-tools \ file://0001-build-use-for-cross-compiler.patch \ " -SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb" -PV = "0.1.0+git${SRCPV}" +SRCREV = "0105384f68e16803891d0a17d9067b1def6a2778" +PV = "0.9.0+git" GO_IMPORT = "import" -INSANE_SKIP_${PN} += "ldflags textrel" +INSANE_SKIP:${PN} += "ldflags textrel" inherit goarch inherit go +S = "${WORKDIR}/git/src/github.com/opencontainers/runtime-tools" + do_compile() { export GOARCH="${TARGET_GOARCH}" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" - export GOPATH="${S}/src/import:${S}/src/import/vendor" + export GOPATH="${WORKDIR}/git/" + export GOROOT="${STAGING_LIBDIR}/go" # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries export CGO_ENABLED="1" export CFLAGS="" export LDFLAGS="" - export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" - export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_CFLAGS="${TARGET_CFLAGS}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" export GO111MODULE=off + export GOFLAGS="-mod=vendor" + + # fixes: + # cannot find package runtime/cgo (using -importcfg) + # ... recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link: + # cannot open file : open : no such file or directory + # export GO_BUILD_FLAGS="-a -pkgdir dontusecurrentpkgs" + export EXTRA_FLAGS="-trimpath" + + cd ${S} - # 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 + oe_runmake tool } do_install() { install -d ${D}/${sbindir} - install ${S}/src/import/oci-runtime-tool ${D}/${sbindir}/oci-runtime-tool + install ${S}/oci-runtime-tool ${D}/${sbindir}/oci-runtime-tool } deltask compile_ptest_base |