Skip to content

Commit da99f65

Browse files
committed
Fix the spec file for the noredist build
1 parent 3165435 commit da99f65

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ releases of cloudstack
111111

112112
To build all non redistributable components, add the noredist flag to the build command:
113113

114-
$ mvn clean install -P systemvm,developer -Dnonoss
114+
$ mvn clean install -P systemvm,developer -Dnoredist
115115

116116
Clear old database (if any) and deploy the database schema:
117117

packaging/centos63/cloud.spec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ cp packaging/centos63/replace.properties build/replace.properties
174174
echo VERSION=%{_maventag} >> build/replace.properties
175175
echo PACKAGE=%{name} >> build/replace.properties
176176

177-
if [ "%{_ossnoss}" == "NONOSS" -o "%{_ossnoss}" == "nonoss" ] ; then
178-
echo "Executing mvn packaging for NONOSS ..."
179-
mvn -Pawsapi,systemvm -Dnonoss package clean install
177+
if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then
178+
echo "Executing mvn packaging with non-redistributable libraries ..."
179+
mvn -Pawsapi,systemvm -Dnoredist clean package
180180
else
181-
echo "Executing mvn packaging for OSS ..."
182-
mvn -Pawsapi package -Dsystemvm clean install
181+
echo "Executing mvn packaging ..."
182+
mvn -Pawsapi,systemvm clean package
183183
fi
184184

185185
%install

0 commit comments

Comments
 (0)