diff options
| author | Jonathan Bauer | 2016-07-15 13:32:36 +0200 |
|---|---|---|
| committer | root | 2016-07-15 13:32:36 +0200 |
| commit | b595ffabc54a89f784e35fc3889e795e348727e3 (patch) | |
| tree | 064b199b17090ba514512cd4b30a750944f9d80a /remote/modules | |
| parent | Merge branch 'master' of 10.4.9.56:/root/tm-scripts (diff) | |
| download | tm-scripts-b595ffabc54a89f784e35fc3889e795e348727e3.tar.gz tm-scripts-b595ffabc54a89f784e35fc3889e795e348727e3.tar.xz tm-scripts-b595ffabc54a89f784e35fc3889e795e348727e3.zip | |
[dnbd3] fix missing dependency on fusermount for dnbd3-fuse
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/dnbd3/module.build | 11 | ||||
| -rw-r--r-- | remote/modules/dnbd3/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/dnbd3/module.conf.ubuntu | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/remote/modules/dnbd3/module.build b/remote/modules/dnbd3/module.build index 1594b9ab..c954879c 100644 --- a/remote/modules/dnbd3/module.build +++ b/remote/modules/dnbd3/module.build @@ -27,8 +27,8 @@ 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" make dnbd3-client || perror "Could not make dnbd3-client" @@ -37,9 +37,10 @@ build() { chmod +xs "dnbd3-client" chmod +x "dnbd3-fuse" cd "$MODULE_DIR" -} -post_copy() { - : + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" } diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf index 29442db7..8d943764 100644 --- a/remote/modules/dnbd3/module.conf +++ b/remote/modules/dnbd3/module.conf @@ -4,6 +4,7 @@ REQUIRED_COMMIT="6d6455b271ac99c5862691620e1217ed7b3b78b4" 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 " |