From b6e300579d40efcec337f210a5b6f00716cd63c0 Mon Sep 17 00:00:00 2001
From: Thomas Oulevey <thomas.oulevey@cern.ch>
Date: May 18 2016 09:51:21 +0000
Subject: - add optional recurent buildroot pkgs

- fix tab hell

---

diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh
index 94e974d..c0756e3 100755
--- a/scripts/create_sig.sh
+++ b/scripts/create_sig.sh
@@ -8,17 +8,17 @@ usage: $0 -d <distribution> -s <signame(s)> -t <tag(s)>
 This script generate new build target in koji for SIGS.
 
 OPTIONS:
-   -a           ARCHES             	 : Force arches e.g : "x86_64","aarch64 i686", etc...
-   -b			                 : Enable non public bootstrap repo (SCLO SIG only)
-   -c		COLLECTION               : Enable collection in the buildroot
-                                           e.g : mariadb100
-					   A single collection can be used at this time.
-   -d           DISTRIBUTION             : 5 6 7
-   -p		SIG PROJECT NAME         : cloud6-<openstack>, sclo-<mariadb100>, etc...
-   -r		SIG PROJECT RELEASE NAME : cloud6-openstack-<juno>
-   -s		SIG NAME                 : cloud
-   -t		DISTTAGS                 : "el7 el7.centos el7_0"
-   -x					 : delete old -build tag and then recreate.
+   -a   ARCHES             	     : Force arches e.g : "x86_64","aarch64 i686", etc...
+   -b                            : Enable non public bootstrap repo (SCLO SIG only)
+   -c   COLLECTION               : Enable collection in the buildroot
+                                   e.g : mariadb100
+A single collection can be used at this time.
+   -d   DISTRIBUTION             : 5 6 7
+   -p   SIG PROJECT NAME         : cloud6-<openstack>, sclo-<mariadb100>, etc...
+   -r   SIG PROJECT RELEASE NAME : cloud6-openstack-<juno>
+   -s   SIG NAME                 : cloud
+   -t   DISTTAGS                 : "el7 el7.centos el7_0"
+   -x                            : delete old -build tag and then recreate.
 EOF
 }
 
@@ -140,6 +140,17 @@ do
 		for PROJECT in $PROJECTS
 		do
 			P_SIG="${SIG}-${PROJECT}"
+            # Add sig project options here FIXME add a command line option for oneshot buildroot fixes.
+            case ${PROJECT} in
+                openstack)
+                    echo "Reading ${PROJECT} additional configs..."
+                    BUILDROOT_PKGS_EXTRAS="rdo-rpm-macros"
+		        ;;
+                *)
+                    BUILDROOT_PKGS_EXTRAS=""
+		        ;;
+            esac
+
 			# Check for -common
 			#$KOJI list-tags | grep $P_SIG-common-candidate &> /dev/null
 			#if [ $? -gt 0 ]
@@ -207,10 +218,10 @@ do
 					if ( $optionc )
                         		then
 						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
-				$KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
+				        $KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
 					else
-						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools
-                                		$KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools
+						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools $BUILDROOT_PKGS_EXTRAS
+                        $KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $BUILDROOT_PKGS_EXTRAS
 					fi
 					$KOJI add-tag-inheritance --priority 5 $R_SIG-$TAG-build buildsys${DIST}
 					$KOJI add-tag-inheritance --priority 10 $R_SIG-$TAG-build $R_SIG-candidate