Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mimic: build/ops: Can't compile Ceph on Fedora 29 as it doesn't recognize python*3*-tox as an install Tox #25294

Merged
merged 2 commits into from Nov 28, 2018
Merged

mimic: build/ops: Can't compile Ceph on Fedora 29 as it doesn't recognize python*3*-tox as an install Tox #25294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40483a6
build/ops: refrain from installing/using lsb_release in install-deps.sh
smithfarm Aug 1, 2018
8151217
build/ops: rpm: stop install-deps.sh clobbering spec file Python buil…
smithfarm Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion ceph.spec.in
View file
Open in desktop
Expand Up @@ -49,9 +49,11 @@
%endif
%endif
%endif
%if 0%{?suse_version} >= 1500
%if 0%{?fedora} >= 29 || 0%{?suse_version} >= 1500
# distros that need a py3 Ceph build
%bcond_with python2
%else
# distros that need a py2 Ceph build
%bcond_without python2
%endif
%if 0%{without python2}
Expand Down
61 changes: 28 additions & 33 deletions install-deps.sh
View file
Open in desktop
Expand Up @@ -24,39 +24,34 @@ export LC_ALL=C # the following is vulnerable to i18n
ARCH=`uname -m`

function munge_ceph_spec_in {
# http://rpm.org/user_doc/conditional_builds.html
local OUTFILE=$1
sed -e 's/@//g' -e 's/%bcond_with make_check/%bcond_without make_check/g' < ceph.spec.in > $OUTFILE
if type python2 > /dev/null 2>&1 ; then
sed -i -e 's/%bcond_with python2/%bcond_without python2/g' $OUTFILE
else
sed -i -e 's/%bcond_without python2/%bcond_with python2/g' $OUTFILE
fi
}

function ensure_decent_gcc_on_deb {
function ensure_decent_gcc_on_ubuntu {
# point gcc to the one offered by g++-7 if the used one is not
# new enough
local old=$(gcc -dumpversion)
local new=$1
local codename=$2
if dpkg --compare-versions $old ge 7.0; then
return
fi

local dist=$(lsb_release --short --codename)

if [ ! -f /usr/bin/g++-${new} ]; then
$SUDO tee /etc/apt/sources.list.d/ubuntu-toolchain-r.list <<EOF
deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $dist main
deb [arch=amd64] http://mirror.cs.uchicago.edu/ubuntu-toolchain-r $dist main
deb [arch=amd64,i386] http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r $dist main
deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $codename main
deb [arch=amd64] http://mirror.cs.uchicago.edu/ubuntu-toolchain-r $codename main
deb [arch=amd64,i386] http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r $codename main
EOF
# import PPA's signing key into APT's keyring
$SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
$SUDO apt-get -y update -o Acquire::Languages=none -o Acquire::Translation=none || true
$SUDO apt-get install -y g++-7
fi

case $dist in
case $codename in
trusty)
old=4.8;;
xenial)
Expand Down Expand Up @@ -163,11 +158,14 @@ else
case $ID in
debian|ubuntu|devuan)
echo "Using apt-get to install dependencies"
$SUDO apt-get install -y lsb-release devscripts equivs
$SUDO apt-get install -y devscripts equivs
$SUDO apt-get install -y dpkg-dev
case "$VERSION" in
*Trusty*|*Xenial*)
ensure_decent_gcc_on_deb 7
*Trusty*)
ensure_decent_gcc_on_ubuntu 7 trusty
;;
*Xenial*)
ensure_decent_gcc_on_ubuntu 7 xenial
;;
*)
$SUDO apt-get install -y gcc
Expand All @@ -181,11 +179,11 @@ else

backports=""
control="debian/control"
case $(lsb_release -sc) in
squeeze|wheezy)
case "$VERSION" in
*squeeze*|*wheezy*)
control="/tmp/control.$$"
grep -v babeltrace debian/control > $control
backports="-t $(lsb_release -sc)-backports"
backports="-t $codename-backports"
;;
esac

Expand All @@ -204,30 +202,27 @@ else
builddepcmd="dnf -y builddep --allowerasing"
fi
echo "Using $yumdnf to install dependencies"
if [ $(lsb_release -si) = CentOS -a $(uname -m) = aarch64 ]; then
if [ "$ID" = "centos" -a $(uname -m) = aarch64 ]; then
$SUDO yum-config-manager --disable centos-sclo-sclo || true
$SUDO yum-config-manager --disable centos-sclo-rh || true
$SUDO yum remove centos-release-scl || true
fi

$SUDO $yumdnf install -y redhat-lsb-core
case $(lsb_release -si) in
Fedora)
case $ID in
fedora)
if test $yumdnf = yum; then
$SUDO $yumdnf install -y yum-utils
fi
;;
CentOS|RedHatEnterpriseServer|VirtuozzoLinux)
centos|rhel|ol|virtuozzo)
$SUDO yum install -y yum-utils
MAJOR_VERSION=$(lsb_release -rs | cut -f1 -d.)
if test $(lsb_release -si) = RedHatEnterpriseServer ; then
$SUDO yum-config-manager --enable rhel-$MAJOR_VERSION-server-optional-rpms
if test $ID = rhel ; then
$SUDO yum-config-manager --enable rhel-$VERSION_ID-server-optional-rpms
fi
$SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/x86_64/
$SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$VERSION_ID/x86_64/
$SUDO yum install --nogpgcheck -y epel-release
$SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
$SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$VERSION_ID
$SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
if test $(lsb_release -si) = CentOS -a $MAJOR_VERSION = 7 ; then
if test $ID = centos -a $VERSION_ID = 7 ; then
$SUDO yum-config-manager --enable cr
case $(uname -m) in
x86_64)
Expand All @@ -241,10 +236,10 @@ else
dts_ver=7
;;
esac
elif test $(lsb_release -si) = RedHatEnterpriseServer -a $MAJOR_VERSION = 7 ; then
elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then
$SUDO yum-config-manager --enable rhel-server-rhscl-7-rpms
dts_ver=7
elif test $(lsb_release -si) = VirtuozzoLinux -a $MAJOR_VERSION = 7 ; then
elif test $ID = virtuozzo -a $MAJOR_VERSION = 7 ; then
$SUDO yum-config-manager --enable cr
fi
;;
Expand All @@ -259,7 +254,7 @@ else
opensuse*|suse|sles)
echo "Using zypper to install dependencies"
zypp_install="zypper --gpg-auto-import-keys --non-interactive install --no-recommends"
$SUDO $zypp_install lsb-release systemd-rpm-macros
$SUDO $zypp_install systemd-rpm-macros
munge_ceph_spec_in $DIR/ceph.spec
$SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
;;
Expand Down