From 63828c24b18cf0ceef09b9e44ab2617941a8707c Mon Sep 17 00:00:00 2001
From: Thomas Oulevey <thomas.oulevey@cern.ch>
Date: Jan 29 2020 13:42:37 +0000
Subject: Fix BUILDROOT per distribution for SIG


---

diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh
index d5f1417..11de0ed 100755
--- a/scripts/create_sig.sh
+++ b/scripts/create_sig.sh
@@ -158,10 +158,10 @@ 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="openstack-macros"
-                    ;;
+                #openstack)
+                #    echo "Reading ${PROJECT} additional configs..."
+                #    BUILDROOT_PKGS_EXTRAS="openstack-macros"
+                #    ;;
                 *)
                     BUILDROOT_PKGS_EXTRAS=""
                 ;;
@@ -259,7 +259,7 @@ do
                         source $CONFIG_PATH/$SIGNAME/$PROJECT/config.sh
                     else
                         BUILDROOT_DEFAULT="curl 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-tools tar"
-                                                COMMON_INHERITANCE=true
+                        COMMON_INHERITANCE=true
                     fi
                     if ( $optionc )
                     then
diff --git a/scripts/sigs/cloud/openstack/config.sh b/scripts/sigs/cloud/openstack/config.sh
index 7d95da2..d587e03 100644
--- a/scripts/sigs/cloud/openstack/config.sh
+++ b/scripts/sigs/cloud/openstack/config.sh
@@ -1,2 +1,9 @@
- BUILDROOT_DEFAULT="openstack-macros bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed unzip util-linux-ng git which buildsys-tools xz"
- COMMON_INHERITANCE=false
+# Add settings per distributions
+
+if [[ "x$DIST" == "x8" || "x$DIST" == "x8s" ]]
+then
+	BUILDROOT_DEFAULT="bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed unzip util-linux-ng git which buildsys-tools xz"
+else
+	BUILDROOT_DEFAULT="openstack-macros bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed unzip util-linux-ng git which buildsys-tools xz"
+fi
+COMMON_INHERITANCE=false