From bb84c696e27b5716bce8fcefb6919ffed0b5d934 Mon Sep 17 00:00:00 2001 From: Ed Robinson Date: Mon, 24 Jul 2017 20:39:13 +0100 Subject: [PATCH] Stubb out libostree support when building on OSX Signed-off-by: Ed Robinson --- Makefile | 3 ++- hack/darwin_tag.sh | 5 +++++ hack/travis_osx.sh | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100755 hack/darwin_tag.sh diff --git a/Makefile b/Makefile index 0e3f0465..89a106ec 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,8 @@ MANPAGES_MD = $(wildcard docs/*.md) BTRFS_BUILD_TAG = $(shell hack/btrfs_tag.sh) LIBDM_BUILD_TAG = $(shell hack/libdm_tag.sh) -LOCAL_BUILD_TAGS = $(BTRFS_BUILD_TAG) $(LIBDM_BUILD_TAG) +DARWIN_BUILD_TAG = $(shell hack/darwin_tag.sh) +LOCAL_BUILD_TAGS = $(BTRFS_BUILD_TAG) $(LIBDM_BUILD_TAG) $(DARWIN_BUILD_TAG) BUILDTAGS += $(LOCAL_BUILD_TAGS) # make all DEBUG=1 diff --git a/hack/darwin_tag.sh b/hack/darwin_tag.sh new file mode 100755 index 00000000..eaa09184 --- /dev/null +++ b/hack/darwin_tag.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +if [ $(uname) == "Darwin" ]; then + echo "containers_image_ostree_stub" +fi diff --git a/hack/travis_osx.sh b/hack/travis_osx.sh index 7b368b82..e4662f6a 100755 --- a/hack/travis_osx.sh +++ b/hack/travis_osx.sh @@ -7,4 +7,4 @@ mkdir -vp ${_projectatomic} ln -vsf $(pwd) ${_projectatomic}/skopeo cd ${_projectatomic}/skopeo -make validate-local test-unit-local binary-local BUILDTAGS=containers_image_ostree_stub +make validate-local test-unit-local binary-local