diff options
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/build-initramfs.sh | 3 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 19 |
2 files changed, 16 insertions, 6 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index dc820fb3..bb8fe1c9 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -99,7 +99,8 @@ build_initramfs_create_system_image='' build_initramfs_cleanup='no' build_initramfs_use_systemd_in_initramfs='no' build_initramfs_dependencies=(cpio git test shift mktemp cat rm sed gzip curl \ - tar grep make gcc cmake readlink dirname dmsetup chroot qemu-nbd) + tar grep make gcc cmake readlink dirname dmsetup chroot) + ##TODO dependencies to check #xmount: fuse #qemu-xmount: glib-2.0 pixman-1 diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 9798172f..dcc96766 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -28,12 +28,21 @@ check() { exceptions.activate # NOTE: xmount must be compiled before qemu_xmount - if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] - then - build_compile_xmount "$moddir/binaries/xmount/" + if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]]; then + if build_compile_xmount "$moddir/binaries/xmount/"; then + local xmount_was_successfull=true + else + local xmount_was_successfull=false + logging.warn \ + "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)." + fi fi - if [[ ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then - build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" + if $xmount_was_successfull && [[ \ + ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \ + ]]; then + build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" || \ + logging.warn \ + "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)." fi if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \ [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]] |