From bc0ba567642cca454e54f4bd5226dfc239c4e47b Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 2 Mar 2022 18:30:18 +0100
Subject: updates to new dnbd3

---
 build-initramfs.sh                      |  1 -
 modules.d/dnbd3-rootfs/helper/build.inc | 15 ++++++++-------
 modules.d/dnbd3-rootfs/module-setup.sh  |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build-initramfs.sh b/build-initramfs.sh
index ce6521b3..1927c2ce 100755
--- a/build-initramfs.sh
+++ b/build-initramfs.sh
@@ -57,7 +57,6 @@ declare -A module_dnbd3=(
      [path]="${_repo_dir}/modules.d/dnbd3-rootfs/binaries/dnbd3"
       [url]="git://git.openslx.org/dnbd3.git"
    [branch]="master"
-   [commit]="c881c79"
 )
 
 declare -A module_qemu_xmount=(
diff --git a/modules.d/dnbd3-rootfs/helper/build.inc b/modules.d/dnbd3-rootfs/helper/build.inc
index d549b8d1..59d1e564 100644
--- a/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/modules.d/dnbd3-rootfs/helper/build.inc
@@ -10,8 +10,8 @@ build_initialize_components() {
     _deps_base_dir="${_mainmoddir}/binaries"
     # We might want to move the "binaries" repos from the dnbd3-rootfs module to main repo one day...
     # TODO check for its existence using modinfo -k <kernel_version>
-    if [[ ! -f "${_deps_base_dir}/dnbd3/build/dnbd3.ko" ]] || \
-        [[ ! -f "${_deps_base_dir}/dnbd3/build/dnbd3-client" ]]; then
+    if [[ ! -f "${_deps_base_dir}/dnbd3/build/src/kernel/dnbd3/dnbd3.ko" ]] || \
+        [[ ! -f "${_deps_base_dir}/dnbd3/build/src/kernel/dnbd3/dnbd3-client" ]]; then
             echo "Could not find dnbd3, building it..."
             if ! CMAKE_FLAGS="-DKERNEL_DIR=${kernel_headers}" \
                 build_compile_dnbd3 "${_deps_base_dir}/dnbd3/"; then
@@ -189,11 +189,12 @@ build_compile_dnbd3() {
     # Inject CMAKE_FLAGS as a way to control how cmake is called,
     # e.g. to pass the kernel version
     cmake ${CMAKE_FLAGS} \
-        -DBUILD_FUSE_CLIENT=OFF \
-        -DBUILD_KERNEL_MODULE=ON \
-        -DBUILD_SERVER=OFF \
-        -DBUILD_STRESSTEST=OFF \
-        ../
+        -DCMAKE_BUILD_TYPE=Release \
+        -DDNBD3_KERNEL_MODULE=ON \
+        -DDNBD3_CLIENT_FUSE=OFF \
+        -DDNBD3_SERVER=OFF \
+        -DDNBD3_SERVER_FUSE=OFF \
+        ..
     make -j dnbd3 dnbd3-client
     local ret=$?
     popd
diff --git a/modules.d/dnbd3-rootfs/module-setup.sh b/modules.d/dnbd3-rootfs/module-setup.sh
index 955fd9b9..0b0aa88a 100755
--- a/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/modules.d/dnbd3-rootfs/module-setup.sh
@@ -57,8 +57,8 @@ check() {
     # non-critical if failed
     $xmount_is_built || echo "Compiling 'xmount'/'libxmount_input_qemu' failed."
 
-    if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \
-       [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then
+    if [[ ! -f "$moddir/binaries/dnbd3/build/src/kernel/dnbd3/dnbd3.ko" ]] || \
+       [[ ! -f "$moddir/binaries/dnbd3/build/src/client/dnbd3-client" ]]; then
         CMAKE_FLAGS="-DKERNEL_VERSION=${kernel}" \
             build_compile_dnbd3 "$moddir/binaries/dnbd3/"
         [[ $? != 0 ]] && return 1
@@ -94,7 +94,7 @@ installkernel() {
 
     # dnbd3
     mkdir -p "${initdir}/${block_kmod_dir}"
-    inst "${moddir}/binaries/dnbd3/build/dnbd3.ko" "${block_kmod_dir}/dnbd3.ko"
+    inst "${moddir}/binaries/dnbd3/build/src/kernel/dnbd3/dnbd3.ko" "${block_kmod_dir}/dnbd3.ko"
 
     # kqcow2 kernel
     local kqcow_loop_kmod_dir="${moddir}/binaries/xloop"
@@ -109,7 +109,7 @@ installkernel() {
 }
 install() {
     # region binaries
-    inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/local/bin/dnbd3-client
+    inst "$moddir/binaries/dnbd3/build/src/client/dnbd3-client" /usr/local/bin/dnbd3-client
     inst "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" \
         /usr/local/bin/systemd-preserve-process-marker
     # xmount
-- 
cgit v1.2.3-55-g7522