--- a/components/facter/facter.p5m Thu Mar 20 07:05:00 2014 -0700
+++ b/components/facter/facter.p5m Thu Mar 20 12:07:13 2014 -0700
@@ -35,95 +35,102 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/005
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/facter
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/Cfkey.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/application.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/architecture.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/arp.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/augeasversion.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/domain.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/ec2.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/facterversion.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/fqdn.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/hardwareisa.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/hardwaremodel.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/hostname.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/id.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/interfaces.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/ipaddress.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/ipaddress6.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/iphostnumber.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/kernel.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/kernelmajversion.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/kernelrelease.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/kernelversion.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/lsbdistcodename.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/lsbdistdescription.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/lsbdistid.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/lsbdistrelease.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/lsbmajdistrelease.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/lsbrelease.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/macaddress.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/macosx.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/manufacturer.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/memory.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/netmask.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/network.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/operatingsystem.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/operatingsystemrelease.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/osfamily.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/path.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/physicalprocessorcount.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/processor.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/ps.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/puppetversion.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/rubysitedir.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/rubyversion.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/selinux.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/ssh.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/timezone.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/uniqueid.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/uptime.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/uptime_days.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/uptime_hours.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/uptime_seconds.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/collection.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/config.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/confine.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/ec2.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/fact.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/ip.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/loader.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/macaddress.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/macosx.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/manufacturer.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/memory.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/monkey_patches.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/netmask.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/plist.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/plist/generator.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/plist/parser.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/processor.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/registry.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/resolution.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/uptime.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/values.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/virtual.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/vlans.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/wmi.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/util/xendomains.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/version.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/virtual.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/vlans.rb
-file path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/xendomains.rb
+# For now, use pkg.depend.bypass-generate, to suppress the automatic
+# dependency on ruby-19, so we can explicitly create
+# the ruby-19 dependency in the build containing the ruby pathname changes
+# going into Solaris 11.2 build 36. When build 36 ruby-19 is
+# installed onto build machines, we can remove the bypass-generate tag
+# and the ruby-19 dependency below.
+file path=usr/bin/facter pkg.depend.bypass-generate=.*
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/Cfkey.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/application.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/architecture.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/arp.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/augeasversion.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/domain.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/ec2.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/facterversion.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/fqdn.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/hardwareisa.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/hardwaremodel.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/hostname.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/id.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/interfaces.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/ipaddress.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/ipaddress6.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/iphostnumber.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/kernel.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/kernelmajversion.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/kernelrelease.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/kernelversion.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/lsbdistcodename.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/lsbdistdescription.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/lsbdistid.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/lsbdistrelease.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/lsbmajdistrelease.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/lsbrelease.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/macaddress.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/macosx.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/manufacturer.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/memory.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/netmask.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/network.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/operatingsystem.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/operatingsystemrelease.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/osfamily.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/path.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/physicalprocessorcount.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/processor.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/ps.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/puppetversion.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/rubysitedir.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/rubyversion.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/selinux.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/ssh.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/timezone.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/uniqueid.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/uptime.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/uptime_days.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/uptime_hours.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/uptime_seconds.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/collection.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/config.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/confine.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/ec2.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/fact.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/ip.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/loader.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/macaddress.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/macosx.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/manufacturer.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/memory.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/monkey_patches.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/netmask.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/plist.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/plist/generator.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/plist/parser.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/processor.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/registry.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/resolution.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/uptime.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/values.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/virtual.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/vlans.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/wmi.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/util/xendomains.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/version.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/virtual.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/vlans.rb
+file path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/xendomains.rb
file files/solaris/lib/facter/zone.rb \
- path=usr/ruby/1.9/lib/$(MACH64)/ruby/vendor_ruby/1.9.1/facter/zone.rb
+ path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/facter/zone.rb
file path=usr/share/man/man8/facter.8
license facter.license license="Apache v2.0"
#
-# Facter & puppet were both changed to use ruby 1.9 in
-# S11.2 build 28. For now, just keep their build versions in sync.
-# After the build 28 packages are available, we can hard-code the
-# the build number here.
-depend type=optional fmri=system/management/[email protected],$(BUILD_VERSION)
+# For now, add an explicit dependency here on ruby-19, to ensure
+# ruby-19 is updated to Solaris 11.2 build 36, when ruby paths were changed.
+# After build machines are updated to build 36, remove the
+# below dependency, as well as the bypass.generate tag on usr/bin/facter,
+# to allow the ruby-19 dependency to be automatically generated.
+depend type=require fmri=pkg:/runtime/[email protected],5.11-0.175.2.0.0.36.0