bug fix.

diff --git a/cookbooks/hadoop/recipes/build.rb b/cookbooks/hadoop/recipes/build.rb
index 77be917..36d9ff2 100644 (file)
--- a/cookbooks/hadoop/recipes/build.rb
+++ b/cookbooks/hadoop/recipes/build.rb
@@ -25,14 +25,18 @@ deb_packages = [
   'build-essential',
   'ant',
   'autoconf',
-  'libtool'
+  'libtool',
+  # for libhadoop
+  'zlib1g-dev'
 ]
 
 rpm_packages = [
   'ant',
   'autoconf',
   'automake',
-  'libtool'
+  'libtool',
+  # for libhadoop
+  'zlib-devel',
 ]
 
 case node[:platform_family]
@@ -45,20 +49,21 @@ end
 version, major_version, middle_version \
   = parse_version_number(node['hadoop']['version'])
 
-if middle_version == '2.0' then
+if middle_version >= '2.0' then
   packages = packages \
     + [
       'cmake',
-      # for libhadoop
-      'zlib1g-dev'
     ]
 end
 
-if middle_version == '2.1' then
+if middle_version >= '2.1' then
   packages = packages \
     + [
       # for libhdfs
-      'pkg-config'
+      node.value_for_platform_family(
+        'debian' => 'pkg-config',
+        'rhel'   => 'pkgconfig'
+      )
     ]
 end
 
@@ -72,11 +77,11 @@ log <<-EOM
 Please Check:
 Extra requirements must be installed by the other recipes or roles.:
   Hadoop 1.x:
-    Orack JDK6
+    Oracle JDK6
     Apache Maven 3.x
     protobuf-compiler 2.4.1
   Hadoop 2.x:
-    Orack JDK6
+    Oracle JDK6
     Apache Maven 3.x
     protobuf-compiler 2.5.0
 EOM

diff --git a/cookbooks/protobuf-compiler/recipes/default.rb b/cookbooks/protobuf-compiler/recipes/default.rb
index 9223080..1f8d3c0 100644 (file)
--- a/cookbooks/protobuf-compiler/recipes/default.rb
+++ b/cookbooks/protobuf-compiler/recipes/default.rb
@@ -36,6 +36,8 @@ deb_packages = [
 
 rpm_packages = [
   'tar',
+  'gcc-c++',
+  'make',
   'autoconf',
   'automake',
   'libtool'