diff options
Diffstat (limited to 'recipes-containers/riddler/riddler_git.bb')
| -rw-r--r-- | recipes-containers/riddler/riddler_git.bb | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb index 8f71649b..2b2902b5 100644 --- a/recipes-containers/riddler/riddler_git.bb +++ b/recipes-containers/riddler/riddler_git.bb @@ -1,24 +1,24 @@ HOMEPAGE = "https://github.com/jfrazelle/riddler" SUMMARY = "Convert `docker inspect` to opencontainers (OCI compatible) runc spec." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1" -SRC_URI = "git://github.com/jfrazelle/riddler;branch=master \ +SRC_URI = "git://github.com/jfrazelle/riddler;branch=master;protocol=https;destsuffix=git/src/github.com/jessfraz/riddler \ file://0001-build-use-to-select-cross-compiler.patch \ " SRCREV = "23befa0b232877b5b502b828e24161d801bd67f6" -PV = "0.1.0+git${SRCPV}" -GO_IMPORT = "import" +PV = "0.1.0+git" -S = "${WORKDIR}/git" +S = "${WORKDIR}/git/src/github.com/jessfraz/riddler" +GO_IMPORT = "github.com/jessfraz/riddler" inherit goarch inherit go # In addition to hosts go does not like, we do not build for mips. # -COMPATIBLE_HOST_mipsarch = "null" +COMPATIBLE_HOST:mipsarch = "null" # This disables seccomp and apparmor, which are on by default in the # go package. @@ -26,32 +26,25 @@ EXTRA_OEMAKE="BUILDTAGS=''" do_compile() { export GOARCH="${TARGET_GOARCH}" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/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/jessfraz/riddler" - ln -sfn "${S}/src/import/parse" "${S}/src/import/vendor/src/github.com/jessfraz/riddler/parse" - export GOPATH="${S}/src/import/vendor" + export GOROOT="${STAGING_LIBDIR}/go" + export GOPATH="${S}/src/import/vendor:${WORKDIR}/git/" # 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}" - cd ${S}/src/import + export CGO_CFLAGS="${TARGET_CFLAGS}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" + export GO111MODULE=off + export GOBUILDFLAGS="-trimpath" + + cd ${S} oe_runmake static } do_install() { install -d ${D}/${sbindir} - install ${S}/src/import/riddler ${D}/${sbindir}/riddler + install ${S}/riddler ${D}/${sbindir}/riddler } |