diff options
Diffstat (limited to 'remote/modules/dnbd3')
-rw-r--r-- | remote/modules/dnbd3/module.build | 17 | ||||
-rw-r--r-- | remote/modules/dnbd3/module.conf | 3 | ||||
-rw-r--r-- | remote/modules/dnbd3/module.conf.ubuntu | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/remote/modules/dnbd3/module.build b/remote/modules/dnbd3/module.build index 1594b9ab..b1bf7613 100644 --- a/remote/modules/dnbd3/module.build +++ b/remote/modules/dnbd3/module.build @@ -27,19 +27,28 @@ build() { cd "$MODULE_DIR/src/kmod" || perror "Could not CD to standalone dnbd3 kmod dir" make MODULE_NAME=dnbd3 KDIR="$KERNEL_HEADERS_DIR" || perror "Could not compile kernel module" mkdir -p "$MODULE_BUILD_DIR/lib/modules/dnbd3" || perror "Could not create lib/modules/dnbd3" - mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Coould not create opt/openslx/bin" - cp "$MODULE_DIR/src/kmod/dnbd3.ko" "$MODULE_BUILD_DIR/lib/modules/dnbd3/" || perror "could not cp dnbd3.ko" + mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not create opt/openslx/bin" + cp "$MODULE_DIR/src/kmod/dnbd3.ko" "$MODULE_BUILD_DIR/lib/modules/dnbd3/" || perror "Could not copy dnbd3.ko" cd "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not cd to build dir for client binary" - cmake "$MODULE_DIR/src/dnbd3" || perror "Could not cmake" + cmake \ + -DBUILD_FUSE_CLIENT=ON \ + -DBUILD_KERNEL_MODULE=ON \ + -DBUILD_SERVER=OFF \ + -DBUILD_STRESSTEST=OFF \ + "$MODULE_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" chmod +xs "dnbd3-client" chmod +x "dnbd3-fuse" cd "$MODULE_DIR" + + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" } post_copy() { : } - diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf index 29442db7..fba4a88b 100644 --- a/remote/modules/dnbd3/module.conf +++ b/remote/modules/dnbd3/module.conf @@ -1,9 +1,10 @@ REQUIRED_MODULES="kernel" REQUIRED_GIT="git://git.openslx.org/dnbd3.git" -REQUIRED_COMMIT="6d6455b271ac99c5862691620e1217ed7b3b78b4" +REQUIRED_COMMIT="0df5be95c5073dfe03234abd26c9b60340f48bdf" REQUIRED_BINARIES=" dnbd3-client dnbd3-fuse + fusermount " REQUIRED_DIRECTORIES=" /lib/modules diff --git a/remote/modules/dnbd3/module.conf.ubuntu b/remote/modules/dnbd3/module.conf.ubuntu index 8033437b..69b5b9de 100644 --- a/remote/modules/dnbd3/module.conf.ubuntu +++ b/remote/modules/dnbd3/module.conf.ubuntu @@ -1,9 +1,11 @@ REQUIRED_CONTENT_PACKAGES=" cmake + fuse " REQUIRED_INSTALLED_PACKAGES=" cmake zlib1g-dev libfuse-dev + fuse " |