2 files changed, 22 insertions, 17 deletions

diff --git a/recipes-containers/oci-runtime-tools/files/0001-build-use-for-cross-compiler.patch b/recipes-containers/oci-runtime-tools/files/0001-build-use-for-cross-compiler.patch
index fedfad37..98194265 100644
--- a/recipes-containers/oci-runtime-tools/files/0001-build-use-for-cross-compiler.patch
+++ b/recipes-containers/oci-runtime-tools/files/0001-build-use-for-cross-compiler.patch
@@ -8,24 +8,21 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  a/src/import/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/import/Makefile a/src/import/Makefile
-index 77626d2..c3a0760 100644
---- a/src/import/Makefile
-+++ a/src/import/Makefile
-@@ -8,11 +8,11 @@ COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)
- all: tool runtimetest
+Index: oci-runtime-tools-0.9.0+gitAUTOINC+0105384f68/src/import/Makefile
+===================================================================
+--- oci-runtime-tools-0.9.0+gitAUTOINC+0105384f68.orig/src/import/Makefile
++++ oci-runtime-tools-0.9.0+gitAUTOINC+0105384f68/src/import/Makefile
+@@ -13,11 +13,11 @@
+ all: tool runtimetest validation-executables
  
  tool:
--       go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o oci-runtime-tool ./cmd/oci-runtime-tool
-+       ${GO} build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o oci-runtime-tool ./cmd/oci-runtime-tool
+-       go build $(BUILD_FLAGS) -o oci-runtime-tool ./cmd/oci-runtime-tool
++       ${GO} build $(BUILD_FLAGS) -o oci-runtime-tool ./cmd/oci-runtime-tool
  
  .PHONY: runtimetest
  runtimetest:
--       CGO_ENABLED=0 go build -installsuffix cgo -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest
-+       CGO_ENABLED=0 ${GO} build -installsuffix cgo -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest
+-       go build $(STATIC_BUILD_FLAGS) -o runtimetest ./cmd/runtimetest
++       ${GO} build $(STATIC_BUILD_FLAGS) -o runtimetest ./cmd/runtimetest
  
  .PHONY: man
  man:
--- 
-2.19.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 32d88304..838d24b3 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -4,12 +4,11 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f662c"
 
 SRC_URI = "git://github.com/opencontainers/runtime-tools.git;branch=master;protocol=https \
-           file://0001-Revert-implement-add-set-function-for-hooks-items.patch \
            file://0001-build-use-for-cross-compiler.patch \
            "
 
-SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
-PV = "0.1.0+git${SRCPV}"
+SRCREV = "0105384f68e16803891d0a17d9067b1def6a2778"
+PV = "0.9.0+git${SRCPV}"
 GO_IMPORT = "import"
 
 INSANE_SKIP:${PN} += "ldflags textrel"
@@ -31,6 +30,12 @@ do_compile() {
         export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
         export GO111MODULE=off
 
+        # 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"
+
         # link fixups for compilation
         rm -f ${S}/src/import/vendor/src
         ln -sf ./ ${S}/src/import/vendor/src
@@ -40,9 +45,12 @@ do_compile() {
         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
+        ln -sf ../../../../cgroups ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/cgroups
+        ln -sf ../../../../filepath ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/filepath
+        ln -sf ../../../../validation ${S}/src/import/vendor/github.com/opencontainers/runtime-tools/validation
         cd ${S}/src/import
 
-        oe_runmake
+        oe_runmake tool
 }
 
 do_install() {