21843287 SMF: enable rsyslog by default
22726160 rsyslog no longer eligible for FOSS evaluation repo
--- a/components/rsyslog/Makefile Tue Oct 04 23:29:56 2016 -0500
+++ b/components/rsyslog/Makefile Wed Oct 05 09:19:43 2016 -0700
@@ -49,11 +49,8 @@
TEST_TARGET= $(NO_TESTS)
# Requires mysql-57 not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_64=
-INSTALL_64=
-PUBLISH_STAMP=
-endif
+# Also, syslog is required to be disabled, only in S12.
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/common.mk
--- a/components/rsyslog/files/rsyslog.xml Tue Oct 04 23:29:56 2016 -0500
+++ b/components/rsyslog/files/rsyslog.xml Wed Oct 05 09:19:43 2016 -0700
@@ -16,7 +16,7 @@
type='service'
version='1'>
- <instance name='rsyslog' enabled='false'>
+ <instance name='rsyslog' enabled='true'>
<!--
Ensure system is configured before starting.
--- a/components/rsyslog/rsyslog.p5m Tue Oct 04 23:29:56 2016 -0500
+++ b/components/rsyslog/rsyslog.p5m Wed Oct 05 09:19:43 2016 -0700
@@ -331,3 +331,5 @@
dir path=var/spool/rsyslog
license rsyslog.license \
license="Apache v2.0, GPLv3, LGPLv3, BSD, MIT, GNU FDL 1.2+"
+# Ensure this pkg is being installed on a s12_108 build or later.
+depend type=optional fmri=system/[email protected]