x/distil
Code Issues Proposed changes

fpm: Convert deb-pre-depends to normal depends.

Browse Source 
This makes the package install a little less weird, esp with a loose
deb. Previously, dpkg would refuse to install the package at all, if
any dependency was unmet. Now, you can install in a broken state, and
then `apt-get install -f` or similar to fix up the missing dependencies.

Change-Id: I0089934db6c009c5e158260785d5af677719a38f
This commit is contained in:
Chris Forbes 2014-10-17 15:09:31 +13:00
parent 9e816b8ce4
commit f6c90d3f23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -34,21 +34,20 @@ deb: clean init
@fpm -s dir -t deb -n ${NAME} -v ${VERSION} \
--config-files etc \
--depends 'libpq-dev' \
--deb-pre-depends "libmysql++-dev" \
--deb-pre-depends python2.7 \
--deb-pre-depends python-pip \
--deb-pre-depends python-dev \
--deb-pre-depends python-virtualenv \
--deb-pre-depends libpq-dev \
--deb-pre-depends python-sqlalchemy \
--deb-pre-depends python-keystoneclient \
--deb-pre-depends python-requests \
--deb-pre-depends python-flask \
--deb-pre-depends python-novaclient \
--deb-pre-depends python-decorator \
--deb-pre-depends python-mysqldb \
--deb-pre-depends python-psycopg2 \
--deb-pre-depends python-yaml \
--depends 'libmysql++-dev' \
--depends python2.7 \
--depends python-pip \
--depends python-dev \
--depends python-virtualenv \
--depends python-sqlalchemy \
--depends python-keystoneclient \
--depends python-requests \
--depends python-flask \
--depends python-novaclient \
--depends python-decorator \
--depends python-mysqldb \
--depends python-psycopg2 \
--depends python-yaml \
--template-scripts \
--template-value install_path=${INSTALL_PATH} \
-C ${WORK_DIR} \

6
client.mk
View File

@ -23,9 +23,9 @@ deb: clean init
@cp -r ./client/*.py ${WORK_DIR}${INSTALL_PATH}/client/
@chmod 0755 ${WORK_DIR}${BINARY_PATH}/distil
@fpm -s dir -t deb -n ${NAME} -v ${VERSION} \
--deb-pre-depends python2.7 \
--deb-pre-depends python-keystoneclient \
--deb-pre-depends python-requests \
--depends python2.7 \
--depends python-keystoneclient \
--depends python-requests \
--template-scripts \
--template-value install_path=${INSTALL_PATH} \
-C ${WORK_DIR} \