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 |
26 |
27 |
27 |
28 GIT_REPO= https://github.com/oracle/puppet-solaris_providers |
28 GIT_REPO= https://github.com/oracle/puppet-solaris_providers |
29 GIT_BRANCH= v2.0.0 |
29 GIT_BRANCH= v2.0.1 |
30 GIT_COMMIT_ID= 4121a38 |
30 GIT_COMMIT_ID= 932309 |
31 GIT_HASH= sha256:082fbc85bf5717990d88fdff80ca8ac9dd80ac5c7506bfa074cec06aa5c8c5a2 |
31 GIT_HASH= sha256:b858d0615642a6eff3215ecdee32dace3988bb296c6b02894b89eabbb907f4fc |
32 |
32 |
33 COMPONENT_NAME= puppet-solaris_providers |
33 COMPONENT_NAME= puppet-solaris_providers |
34 COMPONENT_VERSION= 2.0.0 |
34 COMPONENT_VERSION= 2.0.1 |
35 COMPONENT_PROJECT_URL= https://github.com/oracle/puppet-solaris_providers |
35 COMPONENT_PROJECT_URL= https://github.com/oracle/puppet-solaris_providers |
36 # Construct our own SRC instead of using the default with GIT_COMMIT_ID |
36 # Construct our own SRC instead of using the default with GIT_COMMIT_ID |
37 # archive from github strips leading v from release for vN named release tags |
37 # archive from github strips leading v from release for vN named release tags |
38 COMPONENT_SRC=$(COMPONENT_NAME)-$(shell echo $(GIT_BRANCH) | sed -e 's/v//') |
38 COMPONENT_SRC=$(COMPONENT_NAME)-$(shell echo $(GIT_BRANCH) | sed -e 's/v//') |
39 COMPONENT_BUGDB= utility/puppet |
39 COMPONENT_BUGDB= utility/puppet |
49 PKG_OPTIONS += -I $(COMPONENT_DIR) |
49 PKG_OPTIONS += -I $(COMPONENT_DIR) |
50 |
50 |
51 # Dump a list of files installed in the proto dir but not in the manifest |
51 # Dump a list of files installed in the proto dir but not in the manifest |
52 # this is a convenience target for the package maintainer |
52 # this is a convenience target for the package maintainer |
53 new-files: install |
53 new-files: install |
54 $(PKGSEND) generate $(PROTO_DIR)/opt/puppetlabs/puppet/modules/ | $(GSED) -e 's/\(file\).*path=/\1 path=/' | \ |
54 $(PKGSEND) generate $(PROTO_DIR)/usr/puppetlabs/puppet/modules/ | $(GNU_GREP) -v '/docs/' | \ |
|
55 $(GSED) -e 's/\(file\).*path=/\1 path=/' | \ |
55 $(CAT) oracle-solaris_providers.p5m - | $(GNU_GREP) -h '^file' | sort | uniq -c | \ |
56 $(CAT) oracle-solaris_providers.p5m - | $(GNU_GREP) -h '^file' | sort | uniq -c | \ |
56 $(GSED) -e '/ 2 /d' -e 's/ 1 //' |
57 $(GSED) -e '/ 2 /d' -e 's/ 1 //' |
57 |
58 |
58 # common targets |
59 # common targets |
59 build: $(BUILD_NO_ARCH) |
60 build: $(BUILD_NO_ARCH) |