You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by fr...@apache.org on 2014/10/13 19:44:30 UTC
git commit: updated refs/heads/master to e717450
Repository: cloudstack
Updated Branches:
refs/heads/master 350ac4c4b -> e717450e0
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e717450e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e717450e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e717450e
Branch: refs/heads/master
Commit: e717450e0edd2406c4c3fc7341b3669c4390d507
Parents: 350ac4c
Author: Alex Brett <al...@citrix.com>
Authored: Mon Oct 13 12:18:41 2014 +0100
Committer: Frank Zhang <fr...@citrix.com>
Committed: Mon Oct 13 10:47:42 2014 -0700
----------------------------------------------------------------------
packaging/centos63/package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e717450e/packaging/centos63/package.sh
----------------------------------------------------------------------
diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
index bbc3736..00c1947 100755
--- a/packaging/centos63/package.sh
+++ b/packaging/centos63/package.sh
@@ -79,7 +79,7 @@ function packaging() {
cp -rf default $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
echo "RPM Build Failed "