summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Trautman <ctrautma@redhat.com>2016-04-13 13:15:42 -0400
committerMaryam Tahhan <maryam.tahhan@intel.com>2016-04-19 13:47:44 +0000
commit8aaa9a5debf7a317c1382e62a611e07b3ce273cd (patch)
tree3099eecdbb35b31448673561790c310797bdf9a5
parentc7cc50cea185a2eb4b26958c985fb8c8fdfd9439 (diff)
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>
-rwxr-xr-xsystems/centos/build_base_machine.sh2
-rwxr-xr-xsystems/fedora/20/build_base_machine.sh3
-rwxr-xr-xsystems/fedora/21/build_base_machine.sh3
-rwxr-xr-xsystems/fedora/22/build_base_machine.sh2
-rwxr-xr-xsystems/rhel/7.2/build_base_machine.sh2
5 files changed, 7 insertions, 5 deletions
diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh
index 8339dd2d..d3ac3e2b 100755
--- 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 77d95779..96bb17df 100755
--- 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 0aaa73b6..69b067f9 100755
--- 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 a909e284..0ca565f3 100755
--- 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 a038f7b3..86608066 100755
--- 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\