From 822f280a5d9fc464292cb27181ae75984f307722 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 10 Nov 2017 20:23:51 +0800 Subject: [PATCH] ceph{-,dev-,dev-new-}build: remove handling of non RHEL distros Signed-off-by: Kefu Chai --- ceph-build/build/setup_rpm | 22 ++++------------------ ceph-dev-build/build/setup_rpm | 22 ++++------------------ ceph-dev-new-build/build/setup_rpm | 22 ++++------------------ 3 files changed, 12 insertions(+), 54 deletions(-) diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 1e45661d..8d2d0402 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -29,24 +29,10 @@ tar xzf *.orig.tar.gz cd ceph-* pwd -case $(lsb_release -si) in -CentOS|Fedora|SUSE*|RedHatEnterpriseServer) - case $(lsb_release -si) in - SUSE*) - $SUDO zypper -y yum-utils - ;; - *) - $SUDO yum install -y yum-utils - ;; - esac - $SUDO yum install -y centos-release-scl - sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec - $SUDO yum-builddep -y $DIR/ceph.spec - ;; -*) - echo "$(lsb_release -si) is unknown, dependencies will have to be installed manually." - ;; -esac +$SUDO yum install -y yum-utils +$SUDO yum install -y centos-release-scl +sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec +$SUDO yum-builddep -y $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH` diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index 0365f21f..0e96eb06 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -29,24 +29,10 @@ tar xzf *.orig.tar.gz cd ceph-* pwd -case $(lsb_release -si) in -CentOS|Fedora|SUSE*|RedHatEnterpriseServer) - case $(lsb_release -si) in - SUSE*) - $SUDO zypper -y yum-utils - ;; - *) - $SUDO yum install -y yum-utils - ;; - esac - $SUDO yum install -y centos-release-scl - sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec - $SUDO yum-builddep -y $DIR/ceph.spec - ;; -*) - echo "$(lsb_release -si) is unknown, dependencies will have to be installed manually." - ;; -esac +$SUDO yum install -y yum-utils +$SUDO yum install -y centos-release-scl +sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec +$SUDO yum-builddep -y $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH` diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index 0365f21f..0e96eb06 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -29,24 +29,10 @@ tar xzf *.orig.tar.gz cd ceph-* pwd -case $(lsb_release -si) in -CentOS|Fedora|SUSE*|RedHatEnterpriseServer) - case $(lsb_release -si) in - SUSE*) - $SUDO zypper -y yum-utils - ;; - *) - $SUDO yum install -y yum-utils - ;; - esac - $SUDO yum install -y centos-release-scl - sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec - $SUDO yum-builddep -y $DIR/ceph.spec - ;; -*) - echo "$(lsb_release -si) is unknown, dependencies will have to be installed manually." - ;; -esac +$SUDO yum install -y yum-utils +$SUDO yum install -y centos-release-scl +sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec +$SUDO yum-builddep -y $DIR/ceph.spec BRANCH=`branch_slash_filter $BRANCH` -- 2.47.3