Install liberasurecode-devel for CentOS 7

Code Issues Proposed changes

Since I747c2b8754effbc6ec82af3bf7543fd9599a6c14 we do not install
the RDO package repository anymore and thus liberasurecode-devel
cannot be installed.
For CentOS 7, remove liberasurecode-devel from bindep.txt and install it
from test-setup.sh instead after enabling the RDO package repositories.
Update python dependencies: CentOS 7 does not have python3. Fix the
SUSE tags.
Change-Id: I72aa6b5455dfb025f54e83334983ac280f04afb2

This commit is contained in:

Andreas Jaeger

2017年12月20日 07:14:03 +01:00

parent dc1c55c9a0

commit bdd4eb6936

2 changed files with 26 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

13
bindep.txt

View File

@@ -6,15 +6,22 @@ gcc [platform:rpm]

gettext [!platform:suse]

gettext-runtime [platform:suse]

liberasurecode-dev [platform:dpkg]

liberasurecode-devel [platform:rpm]

# There's no library in CentOS 7 but Fedora and openSUSE have it.

liberasurecode-devel [platform:rpm !platform:centos]

libffi-dev [platform:dpkg]

libffi-devel [platform:rpm]

memcached

python-dev [platform:dpkg]

python-devel [platform:rpm]

python3-dev [platform:dpkg]

python34-devel [platform:redhat]

python3-devel [platfrom:suse]

python3-devel [platform:fedora platform:suse]

# python3-devel does not pull in the python3 package on openSUSE so

# we need to be explicit. The python3 package contains the XML module

# which is required by a python3 virtualenv. Similarly, in python2,

# the XML module is located in python-xml which is not pulled in

# by python-devel as well. See https://bugzilla.suse.com/show_bug.cgi?id=1046990

python3 [platform:suse]

python-xml [platform:suse]

rsync

xfsprogs

libssl-dev [platform:dpkg]

16
tools/test-setup.sh

View File

@@ -12,3 +12,19 @@ truncate -s 1GB $HOME/1G_xfs_file

mkdir -p $HOME/xfstmp

sudo mount -o loop,noatime,nodiratime $HOME/1G_xfs_file $HOME/xfstmp

sudo chmod 777 $HOME/xfstmp

# Install liberasurecode-devel for CentOS from RDO repository.

function is_rhel7 {

[ -f /usr/bin/yum ] && \

cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \

cat /etc/*release | grep -q 'release 7'

}

if is_rhel7; then

# Install CentOS OpenStack repos so that we have access to some extra

# packages.

sudo yum install -y centos-release-openstack-pike

sudo yum install -y liberasurecode-devel

fi