automatic xmount building

1 files changed, 7 insertions, 7 deletions

diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh
index f8180488..b150de58 100644
--- a/builder/dnbd3-rootfs/scripts/build.sh
+++ b/builder/dnbd3-rootfs/scripts/build.sh
@@ -9,10 +9,12 @@ build_compile_qemu_xmount() {
     # Provides the following file:
     # "$1/libxmount_input_qemu.so"
     pushd "$1"
+    local xmount_installation="../xmount/trunk/build/release_build"
     ./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"
+        --extra-cflags="-I${xmount_installation}/include" \
+        --extra-cflags="-I${xmount_installation}/include/xmount" \
+        --disable-fdt --target-list=""
     make libxmount_input_qemu.so
     local ret=$?
     popd
@@ -30,13 +32,11 @@ build_compile_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 \
-        -DCMAKE_INSTALL_PREFIX=./release_build ..
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ ..
     make
-    make install
+    make install DESTDIR=./release_build
     local ret=$?
     popd
     return $ret
@@ -46,7 +46,7 @@ build_clean_xmount() {
 }
 build_clean_qemu_nbd() {
     pushd "$1"
-    make clean
+    make clean # TODO use git clean -f -x
     popd
     return $?
 }