Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24972252 do not publish cloudbase-init when BUILD_TYPE=evaluation
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 31 Oct 2016 13:41:58 -0700
changeset 7179 53d80f33bbc2
parent 7178 5dc920725250
child 7180 bc5351dcb9ac
24972252 do not publish cloudbase-init when BUILD_TYPE=evaluation
components/openstack/cloudbase-init/Makefile file | annotate | diff | comparison | revisions
components/openstack/cloudbase-init/cloudbase-init.p5m file | annotate | diff | comparison | revisions 
--- a/components/openstack/cloudbase-init/Makefile	Mon Oct 31 09:44:53 2016 -0700
+++ b/components/openstack/cloudbase-init/Makefile	Mon Oct 31 13:41:58 2016 -0700
@@ -23,6 +23,7 @@
 # Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
+BUILD_BITS=		NO_ARCH
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cloudbase-init
@@ -39,15 +40,23 @@
 
 TPNO=			26420
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/setup.py.mk
-include $(WS_MAKE_RULES)/ips.mk
+ifneq ($(BUILD_TYPE), evaluation)
+BUILD_STYLE= setup.py
+endif
 
-ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+# FOSS eval upgrade instructions lead to maintenance state; just skip.
+# On S12, the same problem if the pkg is installed, but it's not on the
+# default install list for S12.  If the S12 issue gets fixed, we can drop
+# the following line and thus remove this from the do-not-publish list.
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 # Upstream only supports 3.3 from the Python 3 series
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
+include $(WS_MAKE_RULES)/common.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
 PKG_MACROS +=		PYVER=$(PYTHON_VERSIONS)
 PKG_MACROS +=		PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .)
 
--- a/components/openstack/cloudbase-init/cloudbase-init.p5m	Mon Oct 31 09:44:53 2016 -0700
+++ b/components/openstack/cloudbase-init/cloudbase-init.p5m	Mon Oct 31 13:41:58 2016 -0700
@@ -39,10 +39,9 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2016/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file files/cloudbase-init.conf path=etc/cloudbase-init.conf
-file files/cloudbase-init.xml \
-    path=lib/svc/manifest/application/cloudbase-init.xml
-file files/cloudbase-init path=lib/svc/method/cloudbase-init
+file cloudbase-init.conf path=etc/cloudbase-init.conf
+file cloudbase-init.xml path=lib/svc/manifest/application/cloudbase-init.xml
+file cloudbase-init path=lib/svc/method/cloudbase-init
 file path=usr/bin/cloudbase-init
 file path=usr/lib/python$(PYVER)/vendor-packages/cloudbase_init-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/cloudbase_init-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
upstream/oracle/userland-gate