diff options
author | Jonathan Bauer | 2019-09-06 15:32:30 +0200 |
---|---|---|
committer | Jonathan Bauer | 2019-09-06 15:32:30 +0200 |
commit | 20dc2337a3f642fc6eaf66f45b63d8ad815234b7 (patch) | |
tree | 02e457e0f50df47f70cf20d1472bd9db9216f1f4 /builder/modules.d/dnbd3-rootfs/helper/build.inc | |
parent | [dnbd3-rootfs] fix paths (diff) | |
download | systemd-init-20dc2337a3f642fc6eaf66f45b63d8ad815234b7.tar.gz systemd-init-20dc2337a3f642fc6eaf66f45b63d8ad815234b7.tar.xz systemd-init-20dc2337a3f642fc6eaf66f45b63d8ad815234b7.zip |
[dnbd3-rootfs] more fixes for kqcow
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs/helper/build.inc')
-rw-r--r-- | builder/modules.d/dnbd3-rootfs/helper/build.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index d441695d..2e202d91 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -5,8 +5,8 @@ declare -rg _mainmoddir="$(dirname "${BASH_SOURCE[0]}")/.." 2> /dev/null declare -rg _supported_qcow_handlers=("xmount" "kernel") -initialize_components() { - local qcow_handler="$1" +build_initialize_components() { + local qcow_handler="$_QCOW_HANDLER" IFS='|' _pattern="^(${_supported_qcow_handlers[*]})$" export _pattern if [[ ! "$qcow_handler" =~ $_pattern ]] ; then logging.warn "Unknown qcow handler '$1' - will built all known." @@ -111,10 +111,12 @@ build_compile_qemu_xmount() { local xmount_installation="../xmount/trunk/build/release_build/usr" [ ! -z "$2" ] && xmount_installation="$2" ./configure --enable-xmount-input --python="$(which python2)" \ + --extra-cflags="-std=gnu99" \ --extra-cflags="-fPIC" \ --extra-cflags="-I${xmount_installation}/include" \ --extra-cflags="-I${xmount_installation}/include/xmount" \ - --disable-fdt --target-list="" + --disable-fdt --target-list="" \ + --disable-werror make -j libxmount_input_qemu.so local ret=$? popd |