diff options
| author | Simon Rettberg | 2019-10-28 16:05:36 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-10-28 16:05:36 +0100 |
| commit | 27224bfa85bd82d8eeb30fc4f96ca473aa5ce35e (patch) | |
| tree | df771f82e32c978c3eb075db00f9f27b50259e05 | |
| parent | [SSPS] Clean up download list (diff) | |
| download | setup-scripts-27224bfa85bd82d8eeb30fc4f96ca473aa5ce35e.tar.gz setup-scripts-27224bfa85bd82d8eeb30fc4f96ca473aa5ce35e.tar.xz setup-scripts-27224bfa85bd82d8eeb30fc4f96ca473aa5ce35e.zip | |
[SSPS] Build dnbd3-server from source instead of binary download
| -rw-r--r-- | satellit_installer/includes/00-variables.inc | 4 | ||||
| -rw-r--r-- | satellit_installer/includes/50-install_dnbd3-server.inc | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc index b8eb5b6..19cfc1c 100644 --- a/satellit_installer/includes/00-variables.inc +++ b/satellit_installer/includes/00-variables.inc @@ -22,8 +22,8 @@ PACKAGELIST_SERVER=" default-mysql-server lighttpd php-cgi php-curl cifs-utils php-mbstring sudo php-common php-mysqlnd php-cli nfs-kernel-server curl nfs-common libowfat0 ldap-utils vim gcc make unattended-upgrades gnupg - libowfat-dev libssl-dev gcc make liblzma-dev tftpd-hpa tmate php-xml net-tools - libjansson4 php-soap mtools socat + libowfat-dev libssl-dev liblzma-dev tftpd-hpa tmate php-xml net-tools + libjansson4 libjansson-dev php-soap mtools socat cmake " # Enter here packages needing installation of recommended packages as determines by apt-get: diff --git a/satellit_installer/includes/50-install_dnbd3-server.inc b/satellit_installer/includes/50-install_dnbd3-server.inc index 25d5ba6..8e69db2 100644 --- a/satellit_installer/includes/50-install_dnbd3-server.inc +++ b/satellit_installer/includes/50-install_dnbd3-server.inc @@ -16,11 +16,15 @@ install_dnbd3-server() { # $1: directory to install dnbd3-server to echo "# Installing dnbd3 server... " mkdir -p "$1" || perror "mkdir '$1' failed" - # TODO XXX - # We need to switch to compiling dnbd3-server here - # instead of downloading the binary. - # (Will require libjansson-dev) - perror "Not implemented!" + # Build server + mkdir -p "$BASEDIR/tmp" + git clone https://git.openslx.org/dnbd3.git "$BASEDIR/tmp/dnbd3" || perror "Could not clone dnbd3" + mkdir "$BASEDIR/tmp/dnbd3/build" + cd "$BASEDIR/tmp/dnbd3/build" || perror "Build dir == where?" + cmake -DBUILD_FUSE_CLIENT=OFF -DBUILD_KERNEL_MODULE=OFF -DBUILD_STRESSTEST=OFF -DBUILD_SERVER=ON -DCMAKE_BUILD_TYPE=Release .. || perror "cmake failed" + make dnbd3-server || perror "Building dnbd3-server failed" + cp dnbd3-server "$1/" || perror "Could not copy dnbd3-server binary to $1" + cd - &>/dev/null # Copy config files mkdir -p /etc/dnbd3-server || perror "mkdir /etc/dnbd3-server failed" |