Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit ea8275b

Browse files
committed
fix travis
Now we need linux-headers to build as vsock requires <linux/vm_sockets.h>. But ubuntu saves it to /usr/src/linux-headers-$(uname -r)/include/uapi in its linux-headers package. Need to move it to /usr/include/linux manually because one cannot include the uapi directory directly. Signed-off-by: Peng Tao <bergwolf@gmail.com>
1 parent 991e960 commit ea8275b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ matrix:
99

1010
before_install:
1111
- sudo apt-get update -qq
12-
- sudo apt-get install -y autoconf automake pkg-config libdevmapper-dev libsqlite3-dev libvirt-dev qemu libvirt-bin -qq
12+
- sudo apt-get install -y -qq autoconf automake pkg-config libdevmapper-dev libsqlite3-dev libvirt-dev qemu libvirt-bin linux-headers-$(uname -r)
13+
- sudo mkdir -p /usr/include/linux
14+
- sudo cp /usr/src/linux-headers-$(uname -r)/include/uapi/linux/vm_sockets.h /usr/include/linux
1315
- cd `mktemp -d`
1416
- wget https://git.fedorahosted.org/cgit/lvm2.git/snapshot/lvm2-2_02_131.tar.xz
1517
- tar xf lvm2-2_02_131.tar.xz

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ AS_IF([test "x$enable_daemon" = "xno"],[SYSTEMD_SYSTEMUNIT=no])
7373
AC_SUBST(SYSTEMD_SYSTEMUNIT)
7474
AM_CONDITIONAL(SYSTEMD, test "x${SYSTEMD_SYSTEMUNIT}" != "xno" )
7575

76+
AC_CHECK_FILE([/usr/include/linux/vm_sockets.h],
77+
[], [AC_MSG_ERROR(Cannot find linux/vm_sockets.h)])
78+
7679
AC_CONFIG_FILES([
7780
Makefile
7881
src/Makefile

0 commit comments

Comments
 (0)