diff options
| author | Jonathan Bauer | 2019-09-06 12:35:05 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-09-06 12:35:05 +0200 |
| commit | bf68afa7d50d8c1914266536cbd4aeec5fa4c799 (patch) | |
| tree | b950a3387e1231ce4775e343b17a135596fb9900 | |
| parent | [dnbd3-rootfs] various fixes (diff) | |
| download | systemd-init-bf68afa7d50d8c1914266536cbd4aeec5fa4c799.tar.gz systemd-init-bf68afa7d50d8c1914266536cbd4aeec5fa4c799.tar.xz systemd-init-bf68afa7d50d8c1914266536cbd4aeec5fa4c799.zip | |
[dnbd3-rootfs] fix paths
| -rw-r--r-- | builder/modules.d/dnbd3-rootfs/helper/build.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index 9f78a280..d441695d 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -2,10 +2,7 @@ # -*- coding: utf-8 -*- # shellcheck source=./rebash/core.sh -declare -rg _moddir="$(dirname "${BASH_SOURCE[0]}")/.." - -source "${_moddir}/scripts/rebash/core.sh" -core.import logging +declare -rg _mainmoddir="$(dirname "${BASH_SOURCE[0]}")/.." 2> /dev/null declare -rg _supported_qcow_handlers=("xmount" "kernel") initialize_components() { @@ -15,7 +12,7 @@ initialize_components() { logging.warn "Unknown qcow handler '$1' - will built all known." logging.warn "Supported handlers: ${_supported_qcow_handlers[*]}" fi - _deps_base_dir="${_moddir}/binaries" + _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" ]] || \ @@ -85,13 +82,14 @@ clean_components() { `clean` ' - build_clean_xmount "${_moddir}/binaries/xmount/" - build_clean_qemu_xmount "${_moddir}/binaries/qemu-xmount/" - build_clean_dnbd3 "${_moddir}/binaries/dnbd3/" - build_clean_losetup_qcow "${_moddir}/binaries/kernel-qcow2-util-linux" - build_clean_dnbd3 "${_moddir}/binaries/dnbd3/" + local _submoddir="${_mainmoddir}/binaries" + build_clean_xmount "${_submoddir}/xmount/" + build_clean_qemu_xmount "${_submoddir}/qemu-xmount/" + build_clean_dnbd3 "${_submoddir}/dnbd3/" + build_clean_losetup_qcow "${_submoddir}/kernel-qcow2-util-linux" + build_clean_dnbd3 "${_submoddir}/dnbd3/" build_clean_systemd_preserve_process_marker \ - "${_moddir}/binaries/systemd-preserve-process-marker/" + "${_submoddir}/systemd-preserve-process-marker/" return 0 } # endregion |