equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 include ../../../make-rules/shared-macros.mk |
25 include ../../../make-rules/shared-macros.mk |
26 RUBY_VERSION=2.1 |
26 RUBY_VERSION=2.1 |
27 RUBY_LIB_VERSION=2.1.0 |
27 RUBY_LIB_VERSION=2.1.0 |
28 RUBY_VERSIONS=2.1.0 |
28 RUBY_VERSIONS=2.1.0 |
78 -s files/puppet.xml -o $@ |
78 -s files/puppet.xml -o $@ |
79 |
79 |
80 $(BUILD_DIR)/.smf_updated: $(BUILD_DIR)/puppet.xml |
80 $(BUILD_DIR)/.smf_updated: $(BUILD_DIR)/puppet.xml |
81 $(GDIFF) -q $(BUILD_DIR)/puppet.xml files/puppet.xml > /dev/null 2>&1 || \ |
81 $(GDIFF) -q $(BUILD_DIR)/puppet.xml files/puppet.xml > /dev/null 2>&1 || \ |
82 $(CP) $(BUILD_DIR)/puppet.xml files/puppet.xml |
82 $(CP) $(BUILD_DIR)/puppet.xml files/puppet.xml |
|
83 /usr/sbin/svccfg validate files/puppet.xml |
83 $(TOUCH) $@ |
84 $(TOUCH) $@ |
84 |
85 |
85 # Collect and print puppet module manifests for cherry picking into group |
86 # Collect and print puppet module manifests for cherry picking into group |
86 # dependencies as a helper for the package maintainer |
87 # dependencies as a helper for the package maintainer |
87 PUPPET_MODULE_MANIFESTS = $(sort $(wildcard $(WS_TOP)/components/ruby/puppet-modules/*-*/*.p5m)) |
88 PUPPET_MODULE_MANIFESTS = $(sort $(wildcard $(WS_TOP)/components/ruby/puppet-modules/*-*/*.p5m)) |