Merge pull request #1450 from eastebry/fix-package-dependencies

Fix lucid package building

CMake/Packages.cmake

@@ -14,12 +14,18 @@ elseif(LINUX)
     set(PACKAGE_TYPE "deb")
     set(PACKAGE_ITERATION "1.ubuntu")
     set(PACKAGE_DEPENDENCIES
-      "libc6 (>=2.15)"
       "zlib1g"
       "libbz2-1.0"
-      "libapt-pkg4.12"
       "libreadline6"
     )
+    if(NOT OSQUERY_BUILD_DISTRO STREQUAL "lucid")
+      set(PACKAGE_ITERATION "1.ubuntu10")
+      set(PACKAGE_DEPENDENCIES
+        "${PACKAGE_DEPENDENCIES}"
+        "libc6 (>=2.15)"
+        "libapt-pkg4.12"
+      )
+    endif()
     if(OSQUERY_BUILD_DISTRO STREQUAL "precise")
       set(PACKAGE_ITERATION "1.ubuntu12")
       set(PACKAGE_DEPENDENCIES

tools/deployment/make_linux_package.sh

@@ -118,7 +118,14 @@ function main() {
     PACKAGE_DEPENDENCIES="$PACKAGE_DEPENDENCIES -d \"$element\""
   done
 
-  CMD="fpm -s dir -t $PACKAGE_TYPE \
+  platform OS
+  distro $OS DISTRO
+  FPM="fpm"
+  if [[ $DISTRO == "lucid" ]]; then
+    FPM="/var/lib/gems/1.8/bin/fpm"
+  fi
+
+  CMD="$FPM -s dir -t $PACKAGE_TYPE \
     -n $PACKAGE_NAME -v $PACKAGE_VERSION \
     --iteration $PACKAGE_ITERATION \
     -a $PACKAGE_ARCH               \

tools/provision/lib.sh

@@ -448,7 +448,7 @@ function gem_install() {
   if [[ -n "$(gem list | grep $1)" ]]; then
     log "$1 is already installed. skipping."
   else
-    sudo gem install $1
+    sudo gem install $@
   fi
 }
 

tools/provision/ubuntu.sh

@@ -122,12 +122,14 @@ function main_ubuntu() {
   if [[ $DISTRO = "lucid" ]]; then
     install_snappy
     install_libaptpkg
+    gem_install --no-user-install fpm -v 1.3.3
   else
     # No clang++ on lucid
     set_cc clang
     set_cxx clang++
     package libsnappy-dev
     package libapt-pkg-dev
+    gem_install fpm
   fi
 
   install_thrift
@@ -140,5 +142,4 @@ function main_ubuntu() {
 
   install_libcryptsetup
 
-  gem_install fpm
 }