systems: Fix build scripts from arch specific packages

Fixes the build scripts to stop using arch specific packages.
The issue was found on an x86_64 arch when performing the
installation script. The glibc.i686 would fail to install
because a dependency was installed with a x86_64 arch.

While testing I found other versions of Fedora should also
include the glib2-devel package which was added to Fedora 22
build_base_machine script in another patch. This does not
seem to be included in the base installation of the OS.

Tested on Centos7, Fedora22, 21, 20, and Rhel7.2.

JIRA: VSPERF-281

Change-Id: I884d14fdacf0ceb96c9dc341e82c96d864653766
Signed-off-by: Christian Trautman <ctrautma@redhat.com>

diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh
index 8339dd2..d3ac3e2 100755 (executable)
--- a/systems/centos/build_base_machine.sh
+++ b/systems/centos/build_base_machine.sh
@@ -31,7 +31,7 @@ make
 gcc
 gcc-c++
 libxml2
-glibc.i686
+glibc
 kernel-devel
 
 # tools

diff --git a/systems/fedora/20/build_base_machine.sh b/systems/fedora/20/build_base_machine.sh
index 77d9577..96bb17d 100755 (executable)
--- a/systems/fedora/20/build_base_machine.sh
+++ b/systems/fedora/20/build_base_machine.sh
@@ -28,7 +28,8 @@ automake
 gcc
 gcc-c++
 libxml2
-glibc.i686
+glibc
+glib2-devel
 kernel-devel
 fuse-libs
 fuse

diff --git a/systems/fedora/21/build_base_machine.sh b/systems/fedora/21/build_base_machine.sh
index 0aaa73b..69b067f 100755 (executable)
--- a/systems/fedora/21/build_base_machine.sh
+++ b/systems/fedora/21/build_base_machine.sh
@@ -28,7 +28,8 @@ automake
 gcc
 gcc-c++
 libxml2
-glibc.i686
+glibc
+glib2-devel
 kernel-devel
 fuse-libs
 fuse

diff --git a/systems/fedora/22/build_base_machine.sh b/systems/fedora/22/build_base_machine.sh
index a909e28..0ca565f 100755 (executable)
--- a/systems/fedora/22/build_base_machine.sh
+++ b/systems/fedora/22/build_base_machine.sh
@@ -28,7 +28,7 @@ automake
 gcc
 gcc-c++
 libxml2
-glibc.i686
+glibc
 glib2-devel
 kernel-devel
 fuse-libs

diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index a038f7b..8660806 100755 (executable)
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -29,7 +29,7 @@ pkglist=(\
  gcc\
  gcc-c++\
  glib2-devel\
- glibc.i686\
+ glibc\
  kernel-devel\
  openssl-devel\
  pixman-devel\