diff options
| author | jandob | 2016-01-08 12:49:50 +0100 |
|---|---|---|
| committer | jandob | 2016-01-08 12:49:50 +0100 |
| commit | ae5cee475e7a6773d11a745d24df216936387b2d (patch) | |
| tree | a0b07fe3e3e6dffa75cf6065c7214dc5164d310b | |
| parent | flatten hooks directory tree (diff) | |
| download | systemd-init-ae5cee475e7a6773d11a745d24df216936387b2d.tar.gz systemd-init-ae5cee475e7a6773d11a745d24df216936387b2d.tar.xz systemd-init-ae5cee475e7a6773d11a745d24df216936387b2d.zip | |
fix
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 3 | ||||
| -rw-r--r-- | builder/dnbd3-rootfs/scripts/build.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 2f00f906..18c82b53 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -44,6 +44,9 @@ check() { build_compile_systemd_preserve_process_marker \ "$moddir/binaries/systemd-preserve-process-marker/" fi + if [[ ! -f "$moddir/binaries/qemu/qemu-nbd" ]]; then + build_compile_qemu_nbd "$moddir/binaries/qemu/" + fi # NOTE: This are workarounds for: # - distributions where "systemd-udevd" doesn't lives in "/usr/lib" but in diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh index 7a7bfe1c..a281f626 100644 --- a/builder/dnbd3-rootfs/scripts/build.sh +++ b/builder/dnbd3-rootfs/scripts/build.sh @@ -22,7 +22,7 @@ build_compile_qemu_nbd() { #su -s /bin/bash nobody #yaourt --noconfirm -S glib2-static glibc-static pcre-static #exit - pushd "$1/.." + pushd "$(dirname $1)" git clone git://git.qemu.org/qemu.git qemu cd qemu # TODO check what other features can be disabled |