etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <daan@onecht.net>
This commit is contained in:
Daan Hoogland 2015-11-26 11:23:24 +01:00
parent ab385c814f adb0d3bb74
commit ad2bcc089e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/package.sh
View File

@ -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