use a single bindep config file
The correct way to use bindep is to only have a single bindep config file. Change-Id: I0100f41f26cf0c55e95e13de8baa2b3df3758373
This commit is contained in:
parent
77d3ba9dec
commit
9c7c547bc8
38
bindep.txt
Normal file
38
bindep.txt
Normal file
@ -0,0 +1,38 @@
|
||||
# possible bug in ansible, f29 python 3 env fails
|
||||
# w/o both python-libselinux packages installed
|
||||
# https://bugs.launchpad.net/tripleo/+bug/1812324
|
||||
|
||||
gcc [platform:rpm]
|
||||
git [platform:rpm]
|
||||
iproute [platform:rpm]
|
||||
libyaml [platform:rpm]
|
||||
libffi-devel [platform:rpm]
|
||||
openssl-devel [platform:rpm]
|
||||
# fedora 29
|
||||
python3-libselinux [platform:fedora-29]
|
||||
python3-netaddr [platform:fedora-29]
|
||||
python3-setuptools [platform:fedora-29]
|
||||
python3-virtualenv [platform:fedora-29]
|
||||
python3-pip [platform:fedora-29]
|
||||
# fedora 28
|
||||
python2-libselinux [platform:fedora-28]
|
||||
python3-libselinux [platform:fedora-28]
|
||||
python3-netaddr [platform:fedora-28]
|
||||
python3-setuptools [platform:fedora-28]
|
||||
python3-virtualenv [platform:fedora-28]
|
||||
python3-pip [platform:fedora-28]
|
||||
# fedora 27
|
||||
python2-libselinux [platform:fedora-27]
|
||||
python3-libselinux [platform:fedora-27]
|
||||
python2-netaddr [platform:fedora-27]
|
||||
python2-setuptools [platform:fedora-27]
|
||||
python2-virtualenv [platform:fedora-27]
|
||||
python2-pip [platform:fedora-27]
|
||||
# centos-7
|
||||
libselinux-python [platform:centos-7]
|
||||
python-netaddr [platform:centos-7]
|
||||
python-setuptools [platform:centos-7]
|
||||
python-virtualenv [platform:centos-7]
|
||||
python-pip [platform:centos-7]
|
||||
#
|
||||
redhat-rpm-config [platform:rpm]
|
@ -1,18 +0,0 @@
|
||||
gcc
|
||||
git
|
||||
iproute
|
||||
libyaml
|
||||
libffi-devel
|
||||
openssl-devel
|
||||
python2-libselinux [platform:fedora]
|
||||
python3-libselinux [platform:fedora]
|
||||
python2-netaddr [platform:fedora]
|
||||
python2-setuptools [platform:fedora]
|
||||
python2-virtualenv [platform:fedora]
|
||||
python2-pip [platform:fedora]
|
||||
libselinux-python [platform:centos]
|
||||
python-netaddr [platform:centos]
|
||||
python-setuptools [platform:centos]
|
||||
python-virtualenv [platform:centos]
|
||||
python-pip [platform:centos]
|
||||
redhat-rpm-config
|
@ -1,17 +0,0 @@
|
||||
# possible bug in ansible, f29 python 3 env fails
|
||||
# w/o both python-libselinux packages installed
|
||||
# https://bugs.launchpad.net/tripleo/+bug/1812324
|
||||
|
||||
gcc
|
||||
git
|
||||
iproute
|
||||
libyaml
|
||||
libffi-devel
|
||||
openssl-devel
|
||||
python2-libselinux [platform:fedora]
|
||||
python3-libselinux [platform:fedora]
|
||||
python3-netaddr [platform:fedora]
|
||||
python3-setuptools [platform:fedora]
|
||||
python3-virtualenv [platform:fedora]
|
||||
python3-pip [platform:fedora]
|
||||
redhat-rpm-config
|
@ -198,9 +198,7 @@ install_package_deps_via_bindep(){
|
||||
echo "install_package_deps_via_bindep"
|
||||
sudo -n true && passwordless_sudo="1" || passwordless_sudo="0"
|
||||
if [ "$passwordless_sudo" == "1" ] || [ "$USER_OVERRIDE_SUDO_CHECK" == "1" ]; then
|
||||
for i in `bindep -b -f bindep_$(python_cmd).txt`; do
|
||||
sudo $(package_manager) -y install $i;
|
||||
done
|
||||
bindep -b -f bindep.txt || sudo $(package_manager) -y install `bindep -b -f bindep.txt`;
|
||||
else
|
||||
print_sudo_warning
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user