more work for xloop support

1 files changed, 9 insertions, 13 deletions

diff --git a/modules.d/dnbd3-rootfs/helper/build.inc b/modules.d/dnbd3-rootfs/helper/build.inc
index c36bce16..68b99a8e 100644
--- a/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/modules.d/dnbd3-rootfs/helper/build.inc
@@ -45,18 +45,18 @@ build_initialize_components() {
         fi
     fi
     if [ "$qcow_handler" = "kernel" ]; then
-        if [ ! -f "${_deps_base_dir}/xloop/loop.ko" ] \
+        if [ ! -f "${_deps_base_dir}/xloop/xloop.ko" ] \
             || [ ! -f "${_deps_base_dir}/xloop/loop_file_fmt_qcow.ko" ] \
             || [ ! -f "${_deps_base_dir}/xloop/loop_file_fmt_raw.ko" ]; then
             echo "Could not find loop kernel modules, building them..."
-            if ! build_compile_kernel_qcow "${_deps_base_dir}/xloop"; then
+            if ! build_compile_xloop "${_deps_base_dir}/xloop"; then
                 echo "Failed to build qcow loop kernel modules."
                 return 1
             fi
         fi
         if [ ! -f "${_deps_base_dir}/kernel-qcow2-util-linux/losetup" ]; then
             echo "Could not find losetup with qcow2 support, building it..."
-            if ! build_compile_losetup_qcow "${_deps_base_dir}/kernel-qcow2-util-linux"; then
+            if ! build_compile_xlosetup "${_deps_base_dir}/kernel-qcow2-util-linux"; then
                 echo "Failed to build losetup with qcow support."
                 return 1
             fi
@@ -89,8 +89,8 @@ clean_components() {
     build_clean_xmount "${_submoddir}/xmount/"
     build_clean_qemu_xmount "${_submoddir}/qemu-xmount/"
     build_clean_dnbd3 "${_submoddir}/dnbd3/"
-    build_clean_losetup_qcow "${_submoddir}/kernel-qcow2-util-linux"
-    build_clean_dnbd3 "${_submoddir}/dnbd3/"
+    build_clean_xloop "${_submoddir}/xloop"
+    build_clean_xlosetup "${_submoddir}/kernel-qcow2-util-linux"
     build_clean_systemd_preserve_process_marker \
         "${_submoddir}/systemd-preserve-process-marker/"
     return 0
@@ -204,7 +204,7 @@ build_clean_dnbd3() {
     rm --recursive --force "$1/build"
     return $?
 }
-build_compile_kernel_qcow() {
+build_compile_xloop() {
     pushd "$1"
     # https://lab.ks.uni-freiburg.de/projects/kernel-qcow2/wiki
     if [ -z "$kernel_headers" ]; then
@@ -219,13 +219,9 @@ build_compile_kernel_qcow() {
     popd
     return $ret
 }
-build_clean_kernel_qcow() {
-    if [ -z "$kernel_headers" ]; then
-        echo "Kernel header directory not set, ignoring."
-        return 1
-    fi
-    pushd "$kernel_headers"
-    make -C "$kernel_headers" M=$(pwd)/drivers/block/loop clean
+build_clean_xloop() {
+    pushd "$1"
+    make clean
     local ret=$?
     popd
     return $ret