You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/11/26 11:24:00 UTC
[1/2] git commit: updated refs/heads/4.6 to ad2bcc0
Repository: cloudstack
Updated Branches:
refs/heads/4.6 ab385c814 -> ad2bcc089
CLOUDSTACK-9065: fix bug when creating packaging with noredist flag
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adb0d3bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adb0d3bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adb0d3bb
Branch: refs/heads/4.6
Commit: adb0d3bb744f3c4ed86201a8f811f16a0b9f87de
Parents: 3f7a86d
Author: David Amorim Faria <da...@gmail.com>
Authored: Wed Nov 25 01:41:22 2015 +0100
Committer: David Amorim Faria <da...@gmail.com>
Committed: Wed Nov 25 01:41:22 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adb0d3bb/packaging/package.sh
----------------------------------------------------------------------
diff --git a/packaging/package.sh b/packaging/package.sh
index 484b398..8a87661 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -102,7 +102,7 @@ function packaging() {
echo ". executing rpmbuild"
cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS"
- (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+$DEFOSSNOSS} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
+ (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
if [ $? -ne 0 ]; then
echo "RPM Build Failed "
exit 3
[2/2] git commit: updated refs/heads/4.6 to ad2bcc0
Posted by da...@apache.org.
Merge pull request #1114 from davidamorimfaria/4.6
CLOUDSTACK-9065: fix bug when creating packaging with noredist flagFixes this:
```
$ bash -x package.sh -p noredist -d centos63
(...)
+ rpmbuild --define '_topdir /home/david/cloudstack/packaging/../dist/rpmbuild' '-D_ver 4.6.1' '-D_rel SNAPSHOT' '-D_prerelease 1' -D_ossnoss noredist -bb SPECS/cloud.spec
error: Macro %_ossnoss has empty body
error: Macro %_ossnoss has empty body
error: failed to stat /home/david/cloudstack/dist/rpmbuild/noredist: No such file or directory
+ '[' 1 -ne 0 ']'
+ echo 'RPM Build Failed '
RPM Build Failed
+ exit 3
```
It was missing quotes around the rpmbuild argument '-D_ossnoss noredist'.
* pr/1114:
CLOUDSTACK-9065: fix bug when creating packaging with noredist flag
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad2bcc08
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad2bcc08
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad2bcc08
Branch: refs/heads/4.6
Commit: ad2bcc089ef118c86fedfcbfe079706bb77cdc7f
Parents: ab385c8 adb0d3b
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu Nov 26 11:23:24 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Nov 26 11:23:24 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------