diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-10 19:55:16 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-10 19:55:16 +0100 |
commit | da93fb540c28be3341ec0d37d1fbd90153fb750c (patch) | |
tree | 9615b3ddcc594ba5fb6a89dbce2516adab641153 /solaris | |
parent | 389ce1a86b704222ddc9458cd49c281e7601b803 (diff) | |
parent | f6b3d6dc89e4ba5c2ec643931394db45b8c7f176 (diff) | |
download | bcfg2-da93fb540c28be3341ec0d37d1fbd90153fb750c.tar.gz bcfg2-da93fb540c28be3341ec0d37d1fbd90153fb750c.tar.bz2 bcfg2-da93fb540c28be3341ec0d37d1fbd90153fb750c.zip |
Merge remote branch 'upstream/maint'
* upstream/maint: (59 commits)
Client/Tools/APT: fix pylint errors, enable check
Client/Tools/APT: fix exception name
SYSV: add a migration tool to change simplename attributes to simplefile
doc: Update SYSV datastream format docs
SYSV: change instances of simplename to simplefile
Client/Tools/APT: handle exceptions gracefully
Server/Plugins/Packages: add debsrc attribute to url_map
schemas/packages.xsd: add default value for debsrc
Options.py: Fix database OPTIONS parsing
doc: Fix typos
doc: Add note about Decisions fix for 1.3.6
testsuite: Fix tools __init__.py unit test
Tools: Fix install of non-whitelisted services
doc: Add 1.3.6 release notes
fix keyboard interrupt during intial event handling
Server/Core: also shutdown on exceptions during fam blocking
Reporting: better exception handling
Packages: add name to additional_data for Sources
Packages: add name to sources
YUM: Add options to enable and disable Yum plugins
...
Conflicts:
debian/changelog
doc/conf.py
doc/releases/index.txt
doc/server/database.txt
doc/server/plugins/generators/cfg.txt
doc/server/plugins/generators/sslca.txt
man/bcfg2.conf.5
misc/bcfg2-selinux.spec
misc/bcfg2.spec
osx/Makefile
osx/macports/Portfile
schemas/packages.xsd
solaris-ips/MANIFEST.bcfg2-server.header
solaris-ips/MANIFEST.bcfg2.header
solaris-ips/Makefile
solaris-ips/pkginfo.bcfg2
solaris-ips/pkginfo.bcfg2-server
solaris/Makefile
solaris/pkginfo.bcfg2
solaris/pkginfo.bcfg2-server
src/lib/Bcfg2/Client/Client.py
src/lib/Bcfg2/Client/Proxy.py
src/lib/Bcfg2/Client/Tools/APT.py
src/lib/Bcfg2/Client/Tools/Action.py
src/lib/Bcfg2/Client/Tools/SYSV.py
src/lib/Bcfg2/Client/Tools/YUM.py
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Reporting/Collector.py
src/lib/Bcfg2/Reporting/templates/base.html
src/lib/Bcfg2/Server/Admin/__init__.py
src/lib/Bcfg2/Server/BuiltinCore.py
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/lib/Bcfg2/settings.py
src/lib/Bcfg2/version.py
testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
testsuite/Testsrc/test_code_checks.py
Diffstat (limited to 'solaris')
-rw-r--r-- | solaris/Makefile | 4 | ||||
-rw-r--r-- | solaris/gen-prototypes.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solaris/Makefile b/solaris/Makefile index cdf61d8f7..a8a673e3e 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -2,14 +2,14 @@ PYTHON="/usr/local/bin/python" VERS=1.4.0pre1-1 -PYVERSION := $(shell $(PYTHON) -c "import sys; print sys.version[0:3]") +export PYVERSION := $(shell $(PYTHON) -c "import sys; print sys.version[0:3]") default: clean package package: -mkdir tmp tmp/bcfg2-server tmp/bcfg2 -mkdir -p build/lib/$(PYVERSION)/site-packages - -cd ../ && PYTHONPATH=$(PYTHONPATH):$(PWD)/build/lib/python2.6/site-packages/ $(PYTHON) setup.py install --single-version-externally-managed --record=/dev/null --prefix=$(PWD)/build + -cd ../ && PYTHONPATH=$(PYTHONPATH):$(PWD)/build/lib/python$(PYVERSION)/site-packages/ $(PYTHON) setup.py install --single-version-externally-managed --record=/dev/null --prefix=$(PWD)/build #setuptools appears to use a restictive umask -chmod -R o+r build/ -cat build/bin/bcfg2 | sed -e 's!/usr/bin/python!$(PYTHON)!' > build/bin/bcfg2.new && mv build/bin/bcfg2.new build/bin/bcfg2 diff --git a/solaris/gen-prototypes.sh b/solaris/gen-prototypes.sh index 64aff9edb..b0006df16 100644 --- a/solaris/gen-prototypes.sh +++ b/solaris/gen-prototypes.sh @@ -1,6 +1,6 @@ #!/bin/sh cd build -PP="./lib/python/site-packages/" +PP="./lib/python${PYVERSION}/site-packages/" #bcfg2 echo "i pkginfo=./pkginfo.bcfg2" > ../prototype.tmp |