diff --git a/Dockerfile b/Dockerfile index 08e79196..84a47ca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,9 @@ RUN apt-get update && apt-get install -y \ python-minimal \ libglib2.0-dev \ libapparmor-dev \ + btrfs-tools \ + libdevmapper1.02.1 \ + libdevmapper-dev \ --no-install-recommends \ && apt-get clean diff --git a/Makefile b/Makefile index 1f580edb..a84d11ab 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ ETCDIR ?= ${DESTDIR}/etc ETCDIR_OCID ?= ${ETCDIR}/ocid GO_MD2MAN ?= $(shell which go-md2man) export GOPATH := ${CURDIR}/vendor -BUILDTAGS := selinux seccomp +BUILDTAGS := selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions all: binaries ocid.conf docs diff --git a/hack/btrfs_tag.sh b/hack/btrfs_tag.sh new file mode 100755 index 00000000..cc48504a --- /dev/null +++ b/hack/btrfs_tag.sh @@ -0,0 +1,7 @@ +#!/bin/bash +cc -E - > /dev/null 2> /dev/null << EOF +#include +EOF +if test $? -ne 0 ; then + echo btrfs_noversion +fi diff --git a/hack/libdm_tag.sh b/hack/libdm_tag.sh new file mode 100755 index 00000000..476545e3 --- /dev/null +++ b/hack/libdm_tag.sh @@ -0,0 +1,14 @@ +#!/bin/bash +tmpdir="$PWD/tmp.$RANDOM" +mkdir -p "$tmpdir" +trap 'rm -fr "$tmpdir"' EXIT +cc -c -o "$tmpdir"/libdm_tag.o -x c - > /dev/null 2> /dev/null << EOF +#include +int main() { + struct dm_task *task; + return 0; +} +EOF +if test $? -ne 0 ; then + echo libdm_no_deferred_remove +fi