--- a/components/ruby/mcollective/Makefile Tue Jan 26 16:40:09 2016 -0800
+++ b/components/ruby/mcollective/Makefile Wed Jan 27 09:13:52 2016 -0800
@@ -22,6 +22,10 @@
#
include ../../../make-rules/shared-macros.mk
+RUBY_VERSION= 2.1
+RUBY_LIB_VERSION= 2.1.0
+RUBY_VERSIONS= 2.1.0
+
COMPONENT_NAME= mcollective
COMPONENT_VERSION= 2.8.2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -51,5 +55,5 @@
system-test: $(NO_TESTS)
-REQUIRED_PACKAGES += runtime/ruby-19
+REQUIRED_PACKAGES += runtime/ruby-21
REQUIRED_PACKAGES += system/core-os
--- a/components/ruby/mcollective/mcollective-RUBYVER.p5m Tue Jan 26 16:40:09 2016 -0800
+++ b/components/ruby/mcollective/mcollective-RUBYVER.p5m Wed Jan 27 09:13:52 2016 -0800
@@ -1,9 +1,9 @@
#
# CDDL HEADER START
#
-# The contents of this file path=are subject to the terms of the
+# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
-# You may not use this file path=except in compliance with the License.
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -11,7 +11,7 @@
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
-# file path=and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
@@ -209,7 +209,7 @@
file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/mcollective/vendor/systemu/samples/f.rb
file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/mcollective/vendor/systemu/systemu.gemspec
file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/mcollective/windows_daemon.rb
-file path=usr/ruby/$(RUBY_VERSION)/sbin/mcollectived
+file usr/sbin/mcollectived path=usr/ruby/$(RUBY_VERSION)/sbin/mcollectived
# Make mcollectived available in /usr/sbin
link path=usr/sbin/mcollectived \
--- a/components/ruby/stomp/Makefile Tue Jan 26 16:40:09 2016 -0800
+++ b/components/ruby/stomp/Makefile Wed Jan 27 09:13:52 2016 -0800
@@ -22,6 +22,14 @@
#
include ../../../make-rules/shared-macros.mk
+#
+# Override the inherited RUBY values in shared-macros.mk to be
+# a later release.
+#
+RUBY_VERSION= 2.1
+RUBY_LIB_VERSION= 2.1.0
+RUBY_VERSIONS= 2.1.0
+
COMPONENT_NAME= stomp
COMPONENT_VERSION= 1.3.4
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -36,7 +44,7 @@
# No gemspec is shipped with the gem. Create one
COMPONENT_POST_UNPACK_ACTION= \
- $(GEM) spec $(COMPONENT_ARCHIVE) > $(SOURCE_DIR)/$(GEMSPEC)
+ $(GEM) spec --ruby $(COMPONENT_ARCHIVE) > $(SOURCE_DIR)/$(GEMSPEC)
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/ips.mk
@@ -55,5 +63,5 @@
REQUIRED_PACKAGES += network/amqp/rabbitmq
-REQUIRED_PACKAGES += runtime/ruby-19
+REQUIRED_PACKAGES += runtime/ruby-21
REQUIRED_PACKAGES += system/core-os
--- a/make-rules/install.rb.mk Tue Jan 26 16:40:09 2016 -0800
+++ b/make-rules/install.rb.mk Wed Jan 27 09:13:52 2016 -0800
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
VENDOR_RUBY = /usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)
# default user executable binaries to /usr/bin
INSTALL_RB_BINDIR = $(USRBINDIR)
+INSTALL_RB_SBINDIR = $(USRSBINDIR)
# install.rb scripts do not have any concept of 'build' so make this a
# no-op
@@ -41,6 +42,7 @@
./install.rb --destdir=$(PROTO_DIR) \
--ruby=$(RUBY) \
--bindir=$(INSTALL_RB_BINDIR) \
+ --sbindir=$(INSTALL_RB_SBINDIR) \
--sitelibdir=$(VENDOR_RUBY) \
--mandir=$(USRSHAREMANDIR))
$(COMPONENT_POST_INSTALL_ACTION)