diff -r 988ea0021850 -r cd00ea74156e make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Fri Oct 15 16:14:01 2010 -0500 +++ b/make-rules/shared-macros.mk Fri Oct 15 16:15:38 2010 -0500 @@ -26,6 +26,9 @@ CONSOLIDATION = userland PUBLISHER = $(CONSOLIDATION)-build +IS_GLOBAL_ZONE = $(shell /usr/sbin/zoneadm list | grep -c global) +ROOT = / + # get the most recent build number from the last mercurial tag LAST_HG_TAG = $(shell hg tags -q | head -2 | tail -1) LAST_BUILD_NUM = $(LAST_HG_TAG:build-%=%) @@ -35,6 +38,7 @@ BUILD_NUM = 0.$(shell expr $(LAST_BUILD_NUM) + 1) BUILD_VERSION = $(OS_VERSION)-$(BUILD_NUM) + COMPILER = studio BITS = 32 PYTHON_VERSION = 2.6