From 656d9d1b091718294681d13cf502071b87cbacb6 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 29 Oct 2009 02:23:08 +0000 Subject: Solaris: Packaging update Update packaging to 1.0rc1. Also, the Makefile now dynamically sets the python version based on the version installed on the machine. Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5511 ce84e21b-d406-0410-9b95-82705330c041 --- solaris/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'solaris/Makefile') diff --git a/solaris/Makefile b/solaris/Makefile index 9d177e4b6..893ccbd8e 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,6 +1,7 @@ #!/usr/sfw/bin/gmake -VERS=1.0-1 +VERS=1.0.0-1 +PYVERSION := $(shell /opt/csw/bin/python -c "import sys; print sys.version[0:3]") default: clean package @@ -8,14 +9,17 @@ package: -mkdir tmp tmp/bcfg2-server tmp/bcfg2 -cd ../ && /opt/csw/bin/python setup.py install --prefix=$(PWD) -cat bin/bcfg2 | sed -e 's!/usr/bin/python!/opt/csw/bin/python!' > bin/bcfg2.new && mv bin/bcfg2.new bin/bcfg2 - -pkgmk -o -a `uname -m` -f prototype.bcfg2 -d $(PWD)/tmp -r $(PWD) - -pkgmk -o -a `uname -m` -f prototype.bcfg2-server -d $(PWD)/tmp -r $(PWD) + # Set python version to whichever version is installed + -cat prototype.bcfg2 | sed -e 's!PYVERSION!python$(PYVERSION)!' > prototype.bcfg2.fixed + -cat prototype.bcfg2-server | sed -e 's!PYVERSION!python$(PYVERSION)!' > prototype.bcfg2-server.fixed + -pkgmk -o -a `uname -m` -f prototype.bcfg2.fixed -d $(PWD)/tmp -r $(PWD) + -pkgmk -o -a `uname -m` -f prototype.bcfg2-server.fixed -d $(PWD)/tmp -r $(PWD) -pkgtrans -o -s $(PWD)/tmp $(PWD)/bcfg2-$(VERS) SCbcfg2 -pkgtrans -o -s $(PWD)/tmp $(PWD)/bcfg2-server-$(VERS) SCbcfg2-server -gzip -f $(PWD)/bcfg2-$(VERS) -gzip -f $(PWD)/bcfg2-server-$(VERS) -clean: +clean: -rm -rf tmp bin lib share -rm -rf bcfg2-$(VERS).gz bcfg2-server-$(VERS).gz - + -rm -rf prototype.bcfg2.fixed prototype.bcfg2-server.fixed -- cgit v1.2.3-1-g7c22