[v5,17/21] criu: Link with libuuid

Submitted by Cyrill Gorcunov on May 10, 2018, 2:57 p.m.

Details

Message ID 20180510145801.12322-18-gorcunov@gmail.com
State New
Series "Add support of deleted unix sockets"
Headers show

Commit Message

Cyrill Gorcunov May 10, 2018, 2:57 p.m.
We will need it to generate unique deleted unix sockets.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 contrib/debian/dev-packages.lst      | 1 +
 criu/Makefile.packages               | 4 +++-
 scripts/build/Dockerfile.alpine      | 1 +
 scripts/build/Dockerfile.fedora.tmpl | 1 +
 scripts/build/Dockerfile.tmpl        | 1 +
 scripts/travis/travis-tests          | 2 +-
 6 files changed, 8 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/contrib/debian/dev-packages.lst b/contrib/debian/dev-packages.lst
index b0b664f7293b..fd8569c508c3 100644
--- a/contrib/debian/dev-packages.lst
+++ b/contrib/debian/dev-packages.lst
@@ -6,6 +6,7 @@  protobuf-c-compiler
 protobuf-compiler
 python-protobuf
 libnet-dev
+uuid-dev
 
 # Extra packages, required for testing and building other tools
 pkg-config
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
index 886394fd50b9..3d962e93e19c 100644
--- a/criu/Makefile.packages
+++ b/criu/Makefile.packages
@@ -6,6 +6,7 @@  REQ-RPM-PKG-NAMES	+= protobuf-devel
 REQ-RPM-PKG-NAMES	+= protobuf-python
 REQ-RPM-PKG-NAMES	+= libnl3-devel
 REQ-RPM-PKG-NAMES	+= libcap-devel
+REQ-RPM-PKG-NAMES	+= libuuid-devel
 
 REQ-RPM-PKG-TEST-NAMES  += libaio-devel
 
@@ -16,10 +17,11 @@  REQ-DEB-PKG-NAMES	+= protobuf-compiler
 REQ-DEB-PKG-NAMES	+= python-protobuf
 REQ-DEB-PKG-NAMES	+= libnl-3-dev
 REQ-DEB-PKG-NAMES	+= libcap-dev
+REQ-DEB-PKG-NAMES	+= uuid-dev
 
 REQ-DEB-PKG-TEST-NAMES  += libaio-dev
 
-export LIBS		+= -lrt -lpthread -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet
+export LIBS		+= -luuid -lrt -lpthread -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet
 
 check-packages-failed:
 	$(warning Can not find some of the required libraries)
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index eb33a9ce8bf9..39c88fa32af8 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -12,6 +12,7 @@  RUN apk update && apk add \
 	libcap-dev \
 	libnet-dev \
 	libnl3-dev \
+	util-linux-dev \
 	pkgconfig \
 	protobuf-c-dev \
 	protobuf-dev \
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 85ff5966492d..2659f64ea7d7 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -13,6 +13,7 @@  RUN dnf install -y \
 	libcap-devel \
 	libnet-devel \
 	libnl3-devel \
+	libuuid-devel \
 	make \
 	procps-ng \
 	protobuf-c-devel \
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index f1fff3a52f0f..1caef4dad279 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -13,6 +13,7 @@  RUN apt-get update && apt-get install -y \
 	libaio-dev \
 	libcap-dev \
 	libnl-3-dev \
+	uuid-dev \
 	libprotobuf-c0-dev \
 	libprotobuf-dev \
 	libselinux-dev \
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 384bf5e66467..3bab4f0ee54a 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -3,7 +3,7 @@  set -x -e
 
 TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c0-dev libaio-dev
 		libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev
-		libnl-3-dev gcc-multilib gdb bash python-protobuf
+		libnl-3-dev uuid-dev gcc-multilib gdb bash python-protobuf
 		libnet-dev util-linux asciidoc xmlto libnl-route-3-dev"
 
 travis_prep () {