diff options
Diffstat (limited to 'recipes-containers/oci-image-tools/oci-image-tools_git.bb')
| -rw-r--r-- | recipes-containers/oci-image-tools/oci-image-tools_git.bb | 54 |
1 files changed, 21 insertions, 33 deletions
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 676f3cc4..ade6534d 100644 --- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb +++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb @@ -1,23 +1,14 @@ HOMEPAGE = "https://github.com/opencontainers/image-tools" SUMMARY = "A collection of tools for working with the OCI image format specification" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -DEPENDS = "\ - oci-image-spec \ - oci-runtime-spec \ - go-digest \ - go-errors \ - spf13-cobra \ - spf13-pflag \ - " - -SRC_URI = "git://github.com/opencontainers/image-tools.git \ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +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" -SRCREV = "93db3b16e6738bf9b8bee47d86ac93be5340838b" -PV = "0.2.0-dev+git${SRCPV}" +SRCREV = "11f9988298305d36f64248a6ee55318e60bf170b" +PV = "1.0.0-rc3+git" GO_IMPORT = "import" inherit goarch @@ -27,37 +18,34 @@ inherit go # go package. EXTRA_OEMAKE="BUILDTAGS=''" +S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools" + +COMPATIBLE_HOST:riscv64 = "null" + 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/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 GOROOT="${STAGING_LIBDIR}/go" + export GOPATH="${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 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" +INSANE_SKIP:${PN} += "ldflags textrel" |