From 7c3340e37304213ecc22a08e109f6eb82ff31700 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 13 Oct 2017 12:22:30 +0200
Subject: [dnbd3] build and copy dnbd3-server

---
 core/modules/dnbd3/module.build       |  7 ++++---
 core/modules/dnbd3/module.conf        |  1 +
 core/modules/dnbd3/module.conf.ubuntu | 13 +++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'core/modules/dnbd3')

diff --git a/core/modules/dnbd3/module.build b/core/modules/dnbd3/module.build
index f1df5549..ff614dd4 100644
--- a/core/modules/dnbd3/module.build
+++ b/core/modules/dnbd3/module.build
@@ -34,14 +34,15 @@ build() {
 	cmake \
 		-DBUILD_FUSE_CLIENT=ON \
 		-DBUILD_KERNEL_MODULE=ON \
-		-DBUILD_SERVER=OFF \
+		-DBUILD_SERVER=ON \
 		-DBUILD_STRESSTEST=OFF \
 		"$MODULE_WORK_DIR/src/dnbd3" || perror "Could not cmake"
 	make dnbd3-client || perror "Could not make dnbd3-client"
 	make dnbd3-fuse || perror "Could not make dnbd3-fuse"
-	chown root:root "dnbd3-client" "dnbd3-fuse"
+	make dnbd3-server || perror "Could not make dnbd3-server"
+	chown root:root "dnbd3-client" "dnbd3-fuse" "dnbd3-server"
 	chmod +xs "dnbd3-client"
-	chmod +x "dnbd3-fuse"
+	chmod +x "dnbd3-fuse" "dnbd3-server"
 	cd "$MODULE_WORK_DIR"
 
 	COPYLIST="list_dpkg_output"
diff --git a/core/modules/dnbd3/module.conf b/core/modules/dnbd3/module.conf
index 4de8c8a2..3c4293de 100644
--- a/core/modules/dnbd3/module.conf
+++ b/core/modules/dnbd3/module.conf
@@ -6,6 +6,7 @@ REQUIRED_BINARIES="
 	dnbd3-client
 	dnbd3-fuse
 	fusermount
+	dnbd3-server
 "
 REQUIRED_DIRECTORIES="
 	/lib/modules
diff --git a/core/modules/dnbd3/module.conf.ubuntu b/core/modules/dnbd3/module.conf.ubuntu
index a6d63345..9794054b 100644
--- a/core/modules/dnbd3/module.conf.ubuntu
+++ b/core/modules/dnbd3/module.conf.ubuntu
@@ -1,12 +1,13 @@
 #!/bin/bash
 REQUIRED_CONTENT_PACKAGES="
-				cmake
-				fuse
+	cmake
+	fuse
 "
 
 REQUIRED_INSTALLED_PACKAGES="
-				cmake
-				zlib1g-dev
-				libfuse-dev
-				fuse
+	cmake
+	zlib1g-dev
+	libfuse-dev
+	fuse
+	libjansson-dev
 "
-- 
cgit v1.2.3-55-g7522