fix-protoc-path

Gbp-Pq: Name fix-protoc-path.patch

diff --git a/src/ruby/end2end/package_with_underscore_checker.rb b/src/ruby/end2end/package_with_underscore_checker.rb
index 27ea00ffa7ab358d810e513c6d45ea87c8b2bd55..d4b3c044ac77aa82d375dfe886c38f2f89d70b57 100644 (file)
--- a/src/ruby/end2end/package_with_underscore_checker.rb
+++ b/src/ruby/end2end/package_with_underscore_checker.rb
@@ -21,10 +21,10 @@ def main
 
   fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG']
   bins_sub_dir = ENV['CONFIG']
-  bins_dir = File.join(root_dir, 'bins', bins_sub_dir)
+  bins_dir = '/usr/bin'
 
   plugin = File.join(bins_dir, 'grpc_ruby_plugin')
-  protoc = File.join(bins_dir, 'protobuf', 'protoc')
+  protoc = File.join(bins_dir, 'protoc')
 
   got = nil
 

diff --git a/src/ruby/tools/bin/grpc_tools_ruby_protoc b/src/ruby/tools/bin/grpc_tools_ruby_protoc
index 390c2d37b05a4b83be1fd8b22ffff241c6c70dcf..38ce18289b3563f69363bf406d24adb903d99f80 100755 (executable)
--- a/src/ruby/tools/bin/grpc_tools_ruby_protoc
+++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc
@@ -23,8 +23,7 @@ protoc_name = 'protoc' + ext
 
 plugin_name = 'grpc_ruby_plugin' + ext
 
-protoc_dir = File.join(File.dirname(__FILE__),
-                       PLATFORM.architecture + '-' + PLATFORM.os_name)
+protoc_dir = '/usr/bin'
 
 protoc_path = File.join(protoc_dir, protoc_name)