nets, docker, runc, oci-*tools: go.bbclass compile fixes

Recently in the oe-core the go.bbclass changed and requires the
defition of the GO_IMPORT variable.  This was intended to simplify how
the compilation works with go packages and it is still a work in
progress.

This patch set makes the recipes compatible to generate the same end
result as before using the new go.bbclass from oe-core.

Any patches that were included in the recipes had to have the paths
adjusted because the new go.bbclass manipulates the notion of S to be
S + "src" + "$GO_IMPORT" internally for the purpose of unpack, patch
and compile.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb
index 641d55fc..8e771f5b 100644
--- a/recipes-networking/netns/netns_git.bb
+++ b/recipes-networking/netns/netns_git.bb
@@ -1,11 +1,12 @@
 HOMEPAGE = "https://github.com/jfrazelle/netns"
 SUMMARY = "Runc hook for setting up default bridge networking."
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1"
+LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1"
 
 SRC_URI = "git://github.com/jessfraz/netns;branch=master"
 SRCREV = "85b1ab9fcccbaa404a2636b52a48bbde02437cf7"
 PV = "0.1.0+git${SRCPV}"
+GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
@@ -22,10 +23,10 @@ do_compile() {
         #
         # We also need to link in the ipallocator directory as that is not under
         # a src directory.
-        ln -sfn . "${S}/vendor/src"
-        mkdir -p "${S}/vendor/src/github.com/jessfraz/netns"
-        ln -sfn "${S}/ipallocator" "${S}/vendor/src/github.com/jessfraz/netns/ipallocator"
-        export GOPATH="${S}/vendor"
+        ln -sfn . "${S}/src/import/vendor/src"
+        mkdir -p "${S}/src/import/vendor/src/github.com/jessfraz/netns"
+        ln -sfn "${S}/src/import/ipallocator" "${S}/src/import/vendor/src/github.com/jessfraz/netns/ipallocator"
+        export GOPATH="${S}/src/import/vendor"
 
         # Pass the needed cflags/ldflags so that cgo
         # can find the needed headers files and libraries
@@ -35,10 +36,11 @@ do_compile() {
         export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
         export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
 
+        cd ${S}/src/import
         oe_runmake static
 }
 
 do_install() {
         install -d ${D}/${sbindir}
-        install ${S}/netns ${D}/${sbindir}/netns
+        install ${S}/src/import/netns ${D}/${sbindir}/netns
 }