CLOUDSTACK-7469 Complete simulator build support

The initial commit (f96c65416a2802bcf2a1f8d5a5070ffe6a29111f) missed part of the change to package.sh, so we were not actually passing through the simulator build option to the rpmbuild call. This patch completes the support.

(cherry picked from commit e717450e0edd2406c4c3fc7341b3669c4390d507)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Alex Brett 2014-10-13 12:18:41 +01:00 committed by Rohit Yadav
parent 9cf05dc842
commit 45ebdf34ae

View File

@ -79,7 +79,7 @@ function packaging() {
cp -rf default $RPMDIR/SPECS cp -rf default $RPMDIR/SPECS
cp -rf rhel7 $RPMDIR/SPECS cp -rf rhel7 $RPMDIR/SPECS
(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} "${DOS}" -bb SPECS/cloud.spec) (cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} "${DOS}" -bb SPECS/cloud.spec)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "RPM Build Failed " echo "RPM Build Failed "