github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-06 19:29:18 +00:00
Code Issues Projects Releases Wiki Activity

Stubb out libostree support when building on OSX

Browse Source 
Signed-off-by: Ed Robinson <ed.robinson@reevoo.com>
This commit is contained in:
Ed Robinson 2017-07-24 20:39:13 +01:00
parent 4d5e442c25
commit bb84c696e2
No known key found for this signature in database
GPG Key ID: EC501FCA6421CCF0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -34,7 +34,8 @@ MANPAGES_MD = $(wildcard docs/*.md)
BTRFS_BUILD_TAG = $(shell hack/btrfs_tag.sh) BTRFS_BUILD_TAG = $(shell hack/btrfs_tag.sh)
LIBDM_BUILD_TAG = $(shell hack/libdm_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) BUILDTAGS += $(LOCAL_BUILD_TAGS)
# make all DEBUG=1 # make all DEBUG=1

5
hack/darwin_tag.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
if [ $(uname) == "Darwin" ]; then
echo "containers_image_ostree_stub"
fi

2
hack/travis_osx.sh
View File

@ -7,4 +7,4 @@ mkdir -vp ${_projectatomic}
ln -vsf $(pwd) ${_projectatomic}/skopeo ln -vsf $(pwd) ${_projectatomic}/skopeo
cd ${_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