aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2022-06-12 01:00:04 -0700
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-06-20 12:09:51 -0400
commit4e19bc7c96a9a5adbc72f5e454a75c4d8e498be4 (patch)
tree78b20cf4278938bda973dbad77d39b861bd598b7
parentfe1bd21891838d8dc4f7cf84a13581868251c125 (diff)
downloadmeta-virtualization-4e19bc7c96a9a5adbc72f5e454a75c4d8e498be4.tar.gz
meta-virtualization-4e19bc7c96a9a5adbc72f5e454a75c4d8e498be4.tar.bz2
meta-virtualization-4e19bc7c96a9a5adbc72f5e454a75c4d8e498be4.zip
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 <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/skopeo/skopeo_git.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb
index f3217db..35377a8 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