From 40716daeede13cc0e379d066f56cc4d7dd52505a Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <trippie@gmail.com>
Date: Fri, 4 Oct 2013 10:01:06 +0200
Subject: [PATCH] Backport fixes on package.sh to the 4.2 branch

---
 packaging/centos63/package.sh | 60 ++++++-----------------------------
 1 file changed, 9 insertions(+), 51 deletions(-)

diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
index f30a0e7120a..d6f4c218ba4 100755
--- a/packaging/centos63/package.sh
+++ b/packaging/centos63/package.sh
@@ -21,8 +21,8 @@ function usage() {
  echo "usage: ./package.sh [-p|--pack] [-h|--help] [ARGS]"
  echo ""
  echo "The commonly used Arguments are:"
- echo "oss|OSS         To package OSS specific"
- echo "nonoss|NONOSS   To package NONOSS specific"
+ echo "oss|OSS             To package with only redistributable libraries (default)"
+ echo "nonoss|NONOSS   To package with non-redistributable libraries"
  echo ""
  echo "Examples: ./package.sh -p|--pack oss|OSS"
  echo "          ./package.sh -p|--pack nonoss|NONOSS"
@@ -30,45 +30,14 @@ function usage() {
  exit 1
 }
 
-function defaultPackaging() {
-CWD=`pwd`
-RPMDIR=$CWD/../../dist/rpmbuild
-PACK_PROJECT=cloudstack
-
-VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'`
-if echo $VERSION | grep SNAPSHOT ; then
-  REALVER=`echo $VERSION | cut -d '-' -f 1`
-  DEFVER="-D_ver $REALVER"
-  DEFPRE="-D_prerelease 1"
-  DEFREL="-D_rel SNAPSHOT"
-else
-  REALVER=$VERSION
-  DEFVER="-D_ver $REALVER"
-  DEFREL="-D_rel 1"
-fi
-
-mkdir -p $RPMDIR/SPECS
-mkdir -p $RPMDIR/BUILD
-mkdir -p $RPMDIR/SRPMS
-mkdir -p $RPMDIR/RPMS
-mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
-
-(cd ../../; tar -c --exclude .git --exclude dist  .  | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x )
-(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
-
-cp cloud.spec $RPMDIR/SPECS
-
-(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} -ba SPECS/cloud.spec)
-
-exit
-}
-
 function packaging() {
 	 
 CWD=`pwd`
 RPMDIR=$CWD/../../dist/rpmbuild
 PACK_PROJECT=cloudstack
-DEFOSSNOSS="-D_ossnoss $packageval"
+if [ -n "$1" ] ; then
+  DEFOSSNOSS="-D_ossnoss nonoss"
+fi
 
 
 VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'`
@@ -95,7 +64,7 @@ mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
 
 cp cloud.spec $RPMDIR/SPECS
 
-(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+\"${DEFPRE}\"} "${DEFOSSNOSS}" -bb SPECS/cloud.spec)
+(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec)
 
 exit
 }
@@ -103,7 +72,7 @@ exit
 
 if [ $# -lt 1 ] ; then
 
-	defaultPackaging
+	packaging
 
 elif [ $# -gt 0 ] ; then
 
@@ -123,9 +92,9 @@ elif [ $# -gt 0 ] ; then
 		echo "Doing CloudStack Packaging ....."
 		packageval=$2
 		if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then
-			defaultPackaging
-		elif [ "$packageval" == "nonoss" -o "$packageval" == "NONOSS" ] ; then
 			packaging
+		elif [ "$packageval" == "nonoss" -o "$packageval" == "NONOSS" ] ; then
+			packaging nonoss
 		else
 			echo "Error: Incorrect value provided in package.sh script, Please see help ./package.sh --help|-h for more details."
 			exit 1
@@ -136,19 +105,8 @@ elif [ $# -gt 0 ] ; then
 		usage
 		exit 1
 		;;
-	--)
-		echo "Unrecognized option..."
-		usage
-		exit 1
-		;;
-	-*)
-		echo "Unrecognized option..."
-		usage
-		exit 1
-		;;
 	*)
 		shift
-		break
 		;;
 	esac
 	done