diff options
| -rwxr-xr-x | builder/build-initramfs.sh | 12 | ||||
| m--------- | builder/dnbd3-rootfs/scripts/rebash | 0 |
2 files changed, 4 insertions, 8 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index c9cffc85..90a4fe77 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -56,9 +56,8 @@ set -o errexit build_initramfs__needed_location="$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs" if ! [[ -d "$build_initramfs__needed_location" ]]; then echo "The dnbd3 dracut plugin isn't available, loading it." - if ! hash git 2>/dev/null; then + if ! utils.dependency_check git; then echo "Needed dependency \"git\" isn't available. Please install \"git\" or provide the repositories data structure in \"$(dirname "${BASH_SOURCE[0]}")\"." - result=1 fi build_initramfs__temporary_repository_location="$(mktemp --directory)" git clone git://git.openslx.org/openslx-ng/systemd-init.git \ @@ -99,12 +98,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) - -##TODO dependencies to check -#xmount: fuse -#qemu-xmount: glib-2.0 pixman-1 -#dracut: pkg-config + tar grep make gcc cmake readlink dirname dmsetup chroot pkg-config) +build_initramfs_dependencies_pkgconfig=(fuse glib-2.0 pixman-1) # endregion @@ -321,6 +316,7 @@ function build_initramfs_cleanup() { ## region dependency checks utils.dependency_check "${build_initramfs_dependencies[*]}" +utils_dependency_check_pkgconfig "${build_initramfs_dependencies_pkgconfig[*]}" # TODO check for existing kernel headers. # Find lib locations: $(gcc -print-prog-name=cc1plus) -v if ! ldconfig --print-cache | grep libz.so; then diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash -Subproject 46681d9d6caef2c14b10f4512f12176a7b0c1f4 +Subproject 96e6914cb1ab15d243efe065f51306bae866a99 |