Packaging fixes for Debian 7 & 8.

NREL · Jun 30, 2016 · 2e1df87 · 2e1df87
1 parent 14c4b48
commit 2e1df87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/package/docker_script b/build/package/docker_script
@@ -23,10 +23,10 @@ rm -rf "$build_dir"
 mkdir -p "$build_dir"
 cd "$build_dir"
 
-# When building the packages for Ubuntu 12.04, we need a newer version of CMake
-# than what's available via the packages (we need 2.8.10+ for
+# When building the packages for Debian 7 or Ubuntu 12.04, we need a newer
+# version of CMake than what's available via the packages (we need 2.8.10+ for
 # ExternalProject_Add URL_HASH compatibility).
-if [[ "${ID:-}" == "ubuntu" && "${VERSION_ID:-}" == "12.04" ]]; then
+if [[ "${ID:-}" == "debian" && "${VERSION_ID:-}" == "7" ]] || [[ "${ID:-}" == "ubuntu" && "${VERSION_ID:-}" == "12.04" ]]; then
   if [[ ! -e "$build_dir/build/work/cmake-3.4.3/bin/cmake" ]]; then
     mkdir -p "$build_dir/build/work/cmake-3.4.3"
     curl -L "https://cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz" | tar --strip-components 1 -C "$build_dir/build/work/cmake-3.4.3" -xz

diff --git a/build/package_dependencies.sh b/build/package_dependencies.sh
@@ -154,7 +154,7 @@ elif [ -f /etc/debian_version ]; then
     openjdk-$openjdk_version-jdk
   )
 
-  if [[ "$ID" == "ubuntu" && "$VERSION_ID" == "16.04" ]]; then
+  if [[ "$ID" == "debian" && "$VERSION_ID" == "8" ]] || [[ "$ID" == "ubuntu" && "$VERSION_ID" == "16.04" ]]; then
     core_build_dependencies+=("libtool-bin")
   fi
 else