diff options
author | Thiago Abdo | 2019-11-06 14:28:47 +0100 |
---|---|---|
committer | Thiago Abdo | 2019-11-06 14:28:47 +0100 |
commit | 5d80709e96b74a27443ff6538f2c000442308471 (patch) | |
tree | 52a0f26694303206ad2ee112c4707fa0af5ca994 /builder/modules.d/dnbd3-rootfs/helper | |
parent | Merge branch 'centos8' of git.openslx.org:openslx-ng/systemd-init into centos8 (diff) | |
parent | fix include (diff) | |
download | systemd-init-5d80709e96b74a27443ff6538f2c000442308471.tar.gz systemd-init-5d80709e96b74a27443ff6538f2c000442308471.tar.xz systemd-init-5d80709e96b74a27443ff6538f2c000442308471.zip |
Merge branch 'nobash' into centos8
Diffstat (limited to 'builder/modules.d/dnbd3-rootfs/helper')
-rw-r--r-- | builder/modules.d/dnbd3-rootfs/helper/build.inc | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index ab5418d4..b3f9561c 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -1,6 +1,5 @@ #!/usr/bin/env bash # -*- coding: utf-8 -*- -# shellcheck source=./rebash/core.sh declare -rg _mainmoddir="$(dirname "${BASH_SOURCE[0]}")/.." 2> /dev/null @@ -9,34 +8,34 @@ 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 '$qcow_handler' - will built all known." - logging.warn "Supported handlers: ${_supported_qcow_handlers[*]}" + echo "Unknown qcow handler '$qcow_handler' - will built all known." + echo "Supported handlers: ${_supported_qcow_handlers[*]}" fi _deps_base_dir="${_mainmoddir}/binaries" # We might want to move the "binaries" repos from the dnbd3-rootfs module to main repo one day... # TODO check for its existence using modinfo -k <kernel_version> if [[ ! -f "${_deps_base_dir}/dnbd3/build/dnbd3.ko" ]] || \ [[ ! -f "${_deps_base_dir}/dnbd3/build/dnbd3-client" ]]; then - logging.info "Could not find dnbd3, building it..." + echo "Could not find dnbd3, building it..." if ! CMAKE_FLAGS="-DKERNEL_DIR=${kernel_headers}" \ build_compile_dnbd3 "${_deps_base_dir}/dnbd3/"; then - logging.error "Failed to build dnbd3." + echo "Failed to build dnbd3." return 1 fi fi # take care of the qcow handler if [ -z "$qcow_handler" ] || [ "$qcow_handler" = "xmount" ]; then if [[ ! -f "${_deps_base_dir}/xmount/trunk/build/src/xmount" ]]; then - logging.info "Could not find xmount binary, building it..." + echo "Could not find xmount binary, building it..." if ! build_compile_xmount "${_deps_base_dir}/xmount/"; then - logging.error "Failed to build xmount binary." + echo "Failed to build xmount binary." return 1 fi fi if [[ ! -f "${_deps_base_dir}/qemu-xmount/libxmount_input_qemu.so" ]]; then - logging.info "Could not find xmount qemu library, building it..." + echo "Could not find xmount qemu library, building it..." if ! build_compile_qemu_xmount "${_deps_base_dir}/qemu-xmount/"; then - logging error "Failed to build xmount qemu library." + echo "Failed to build xmount qemu library." return 1 fi fi @@ -45,16 +44,16 @@ build_initialize_components() { if [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop.ko" ] \ || [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop_file_fmt_qcow.ko" ] \ || [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop_file_fmt_raw.ko" ]; then - logging.info "Could not find loop kernel modules, building them..." + echo "Could not find loop kernel modules, building them..." if ! build_compile_kernel_qcow "${_deps_base_dir}/kernel-qcow2-linux"; then - logging.error "Failed to build qcow loop kernel modules." + echo "Failed to build qcow loop kernel modules." return 1 fi fi if [ ! -f "${_deps_base_dir}/kernel-qcow2-util-linux/losetup" ]; then - logging.info "Could not find losetup with qcow2 support, building it..." + echo "Could not find losetup with qcow2 support, building it..." if ! build_compile_losetup_qcow "${_deps_base_dir}/kernel-qcow2-util-linux"; then - logging.error "Failed to build losetup with qcow support." + echo "Failed to build losetup with qcow support." return 1 fi fi @@ -62,14 +61,14 @@ build_initialize_components() { # always compile this helper since it does not cost much to do so if [[ ! -f "${_deps_base_dir}/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then - logging.info "Could not find systemd-preserve-process-marker binary, building it ..." + echo "Could not find systemd-preserve-process-marker binary, building it ..." if ! build_compile_systemd_preserve_process_marker \ "${_deps_base_dir}/systemd-preserve-process-marker/"; then - logging.error "Failed to build systemd-preserve-process-marker" + echo "Failed to build systemd-preserve-process-marker" return 1 fi fi - logging.info "Compilation of dnbd3-rootfs dependencies succeeded." + echo "Compilation of dnbd3-rootfs dependencies succeeded." return 0 } @@ -205,7 +204,7 @@ build_compile_kernel_qcow() { pushd "$1" # https://lab.ks.uni-freiburg.de/projects/kernel-qcow2/wiki if [ -z "$kernel_headers" ]; then - logging.error "Kernel header directory not set, ignoring." + echo "Kernel header directory not set, ignoring." return 1 fi mkdir -p "${kernel_headers}/drivers/block/loop" @@ -232,7 +231,7 @@ build_compile_kernel_qcow() { } build_clean_kernel_qcow() { if [ -z "$kernel_headers" ]; then - logging.error "Kernel header directory not set, ignoring." + echo "Kernel header directory not set, ignoring." return 1 fi pushd "$kernel_headers" |