vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #969 from mrunalp/btrfs_build

Browse source 
Btrfs build
This commit is contained in:
Mrunal Patel 2017-10-03 18:01:14 -07:00 committed by GitHub
commit 3e2ad8f10a
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -11,7 +11,7 @@ LIBEXECDIR ?= ${PREFIX}/libexec
MANDIR ?= ${PREFIX}/share/man MANDIR ?= ${PREFIX}/share/man
ETCDIR ?= ${DESTDIR}/etc ETCDIR ?= ${DESTDIR}/etc
ETCDIR_CRIO ?= ${ETCDIR}/crio ETCDIR_CRIO ?= ${ETCDIR}/crio
BUILDTAGS ?= selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) BUILDTAGS ?= selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) $(shell hack/btrfs_installed_tag.sh)
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d

3
contrib/test/integration/e2e.yml
View file

@ -48,6 +48,9 @@
&> {{ artifacts }}/e2e.log &> {{ artifacts }}/e2e.log
# Fix vim syntax hilighting: " # Fix vim syntax hilighting: "
- name: disable SELinux
command: setenforce 0
- name: run e2e tests - name: run e2e tests
shell: "{{ e2e_shell_cmd | regex_replace('\\s+', ' ') }}" shell: "{{ e2e_shell_cmd | regex_replace('\\s+', ' ') }}"
args: args:

7
hack/btrfs_installed_tag.sh Executable file
View file

@ -0,0 +1,7 @@
#!/bin/bash
cc -E - > /dev/null 2> /dev/null << EOF
#include <btrfs/ioctl.h>
EOF
if test $? -ne 0 ; then
echo exclude_graphdriver_btrfs
fi