automatic xmount building

1 files changed, 13 insertions, 7 deletions

diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh
index 1aa835ab..cff6a2bd 100644
--- a/builder/dnbd3-rootfs/scripts/build.sh
+++ b/builder/dnbd3-rootfs/scripts/build.sh
@@ -3,13 +3,17 @@ core.import logging
 
 build_compile_qemu_xmount() {
     # Downloads and compiles qemu libxmount.
+    # NOTE: expects xmount installation under
+    # ../xmount/trunk/build/release_build/
     #
     # Provides the following file:
     # "$1/libxmount_input_qemu.so"
 
     pushd "$1"
-    ./configure --enable-xmount-input --extra-cflags=-fPIC \
-        --python=$(which python2)
+    ./configure --enable-xmount-input --python=$(which python2) \
+        --extra-cflags="-fPIC" \
+        --extra-cflags="-I../xmount/trunk/build/release_build/include" \
+        --extra-cflags="-I../xmount/trunk/build/release_build/include/xmount"
     make libxmount_input_qemu.so
     local ret=$?
     popd
@@ -24,14 +28,16 @@ build_clean_qemu_xmount() {
 build_compile_xmount() {
     # Downloads and compiles xmount
     #
-    # Provides the following files:
-    # "$1/trunk/build/libxmount_input/libxmount_input_raw/libxmount_input_raw.so"
-    # "$1/trunk/build/src/xmount"
+    # Provides the xmount installation under:
+    # "$1/trunk/build/release_build/"
     pushd "$1"
+    sed -i 's:${CMAKE_INSTALL_PREFIX}/lib/xmount:/usr/lib/xmount:' trunk/src/CMakeLists.txt
     mkdir -p trunk/build
     cd trunk/build
-    cmake -DCMAKE_BUILD_TYPE=Release ..
+    cmake -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=./release_build ..
     make
+    make install
     local ret=$?
     popd
     return $ret
@@ -147,7 +153,7 @@ build_clean_systemd_preserve_process_marker() {
     #
     # >>> build_clean_systemd_preserve_process_marker path/to/program/folder
     pushd "$1"
-    make clean
+    ! make clean
     popd
     return $?
 }