From ce03a8868f90aca0d31dff3f17f49ef13ce923b9 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Sun, 12 Jun 2022 01:00:04 -0700 Subject: skopeo: clean up depends and fix CGO settings According to https://github.com/containers/skopeo/blob/main/install.md#building-from-source, the ostree dependency is not needed. Also, adjust the CGO_CFLAGS and CGO_LDFALGS to use target flags instead of the SDK ones. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- recipes-containers/skopeo/skopeo_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb index f3217dbf..35377a8d 100644 --- a/recipes-containers/skopeo/skopeo_git.bb +++ b/recipes-containers/skopeo/skopeo_git.bb @@ -9,7 +9,6 @@ DEPENDS = " \ lvm2 \ btrfs-tools \ glib-2.0 \ - ostree \ " inherit go @@ -61,8 +60,8 @@ do_compile() { 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}" + export CGO_CFLAGS="${TARGET_CFLAGS}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" cd ${S}/src/import export GO111MODULE=off -- cgit v1.2.3-54-g00ecf