3 files changed, 13 insertions, 22 deletions

diff --git a/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch b/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
index 78d2b9d0..b61d4f49 100644
--- a/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
+++ b/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
@@ -12,10 +12,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
  image/config.go | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/import/image/config.go b/src/import/image/config.go
+diff --git a/image/config.go b/image/config.go
 index d28b1bc4fe5f..37dfd1f14ef7 100644
---- a/src/import/image/config.go
-+++ b/src/import/image/config.go
+--- a/image/config.go
++++ b/image/config.go
 @@ -106,7 +106,7 @@ func (c *config) runtimeSpec(rootfs string) (*specs.Spec, error) {
                 s.Process.User.UID = uint32(uid)
                 s.Process.User.GID = uint32(gid)
diff --git a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch
index 7e0b2a11..65c2929a 100644
--- a/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch
+++ b/recipes-containers/oci-image-tools/files/0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch
@@ -13,10 +13,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/import/Makefile b/src/import/Makefile
+diff --git a/Makefile b/Makefile
 index bacb341..1bfe021 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -27,7 +27,7 @@ check-license:
  
  .PHONY: tool
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index e0b27163..4beb3a63 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -1,7 +1,7 @@
 HOMEPAGE = "https://github.com/opencontainers/image-tools"
 SUMMARY = "A collection of tools for working with the OCI image format specification"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 DEPENDS = "\
            oci-image-spec \
@@ -12,7 +12,7 @@ DEPENDS = "\
            spf13-pflag \
           "
 
-SRC_URI = "git://github.com/opencontainers/image-tools.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/opencontainers/image-tools.git;branch=master;protocol=https;destsuffix=git/src/github.com/opencontainers/image-tools \
            file://0001-config-make-Config.User-mapping-errors-a-warning.patch \
            file://0001-tool-respect-GO-and-GOBUILDFLAGS-when-building.patch"
 
@@ -27,21 +27,12 @@ inherit go
 # go package. 
 EXTRA_OEMAKE="BUILDTAGS=''"
 
+S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools"
+
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
         export GOROOT="${STAGING_LIBDIR}/go"
-        # Setup vendor directory so that it can be used in GOPATH.
-        #
-        # Go looks in a src directory under any directory in GOPATH but riddler
-        # uses 'vendor' instead of 'vendor/src'. We can fix this with a symlink.
-        #
-        # We also need to link in the ipallocator directory as that is not under
-        # a src directory.
-        ln -sfn . "${S}/src/import/vendor/src"
-        mkdir -p "${S}/src/import/vendor/src/github.com/opencontainers/image-tools/"
-        ln -sfn "${S}/src/import/image" "${S}/src/import/vendor/src/github.com/opencontainers/image-tools/image"
-        ln -sfn "${S}/src/import/version" "${S}/src/import/vendor/src/github.com/opencontainers/image-tools/version"
-        export GOPATH="${S}/src/import/vendor"
+        export GOPATH="${WORKDIR}/git/"
 
         # Pass the needed cflags/ldflags so that cgo
         # can find the needed headers files and libraries
@@ -54,14 +45,14 @@ do_compile() {
 
         export GOBUILDFLAGS="-trimpath"
 
-        cd ${S}/src/import
+        cd ${S}
 
         oe_runmake tool
 }
 
 do_install() {
         install -d ${D}/${sbindir}
-        install ${S}/src/import/oci-image-tool ${D}/${sbindir}/
+        install ${S}/oci-image-tool ${D}/${sbindir}/
 }
 
 INSANE_SKIP:${PN} += "ldflags textrel"