Andrzej Szeszo
2014-02-25 bb91509aa4165d4f38d5484f4ccdb14834d28652
Enable new version scheme
2 files modified
9 ■■■■■ changed files
components/illumos/illumos-gate/Makefile 5 ●●●●● patch | view | raw | blame | history
make-rules/ips-buildinfo.mk 4 ●●● patch | view | raw | blame | history
components/illumos/illumos-gate/Makefile
@@ -23,7 +23,7 @@
GIT_CHANGESET=HEAD
NIGHTLY_OPTIONS=-nClmprt
ONNV_BUILDNUM=151.1.8.1
ONNV_BUILDNUM=$(BRANCHID)
COMPONENT_REVISION=$(shell cd $(COMPONENT_SRC); git rev-list HEAD --count)
@@ -87,7 +87,8 @@
      echo export CW_NO_SHADOW=1; \
      echo export __GNUC=\"\"; \
      echo export ONLY_LINT_DEFS=-I\$$SPRO_ROOT/sunstudio12.1/prod/include/lint; \
      echo export ONNV_BUILDNUM=$(ONNV_BUILDNUM)) > \
      echo export ONNV_BUILDNUM=$(ONNV_BUILDNUM); \
      echo export PKGVERS_BRANCH=$(ONNV_BUILDNUM)) > \
      illumos.sh && \
      time /opt/onbld/bin/nightly illumos.sh
    $(TOUCH) $@
make-rules/ips-buildinfo.mk
@@ -53,9 +53,7 @@
# Branch Identifier.  Used in the version section of the package name to
# identify the operating system branch that the package was produced for.
#
# XXX don't use new versioning scheme just yet
#BRANCHID ?= $(RELEASE_MAJOR).$(RELEASE_MINOR).$(UPDATENUM).$(COMPONENT_REVISION)
BRANCHID ?= 0.151.1.8.1
BRANCHID ?= $(RELEASE_MAJOR).$(RELEASE_MINOR).$(UPDATENUM).$(COMPONENT_REVISION)
#
# Build Version.  Used in the version section of the package name to identify