]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-deploy: remove get_rpm_dist as it exists in build_utils.sh
authorAndrew Schoen <aschoen@redhat.com>
Tue, 17 Nov 2015 17:13:46 +0000 (11:13 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Tue, 17 Nov 2015 17:13:46 +0000 (11:13 -0600)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
ceph-deploy/build/build

index 94d892952ce5f0ee0fa278f5588cf01a25eaaee9..a2e8880f7017fd5aa4a20062b0786105ca2df86e 100644 (file)
@@ -34,45 +34,7 @@ then
         # Tag tree and update version number in change log and
         # in setup.py before building.
 
-        get_rpm_dist() {
-            LSB_RELEASE=/usr/bin/lsb_release
-            [ ! -x $LSB_RELEASE ] && echo unknown && exit
-
-            ID=`$LSB_RELEASE --short --id`
-
-            case $ID in
-            RedHatEnterpriseServer)
-                DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
-                DISTRO=rhel
-                ;;
-            CentOS)
-                DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
-                DISTRO=centos
-                ;;
-            Fedora)
-                DISTRO_VERSION=`$LSB_RELEASE --short --release`
-                DISTRO=fedora
-                ;;
-            SUSE\ LINUX)
-                DESC=`$LSB_RELEASE --short --description`
-                DISTRO_VERSION=`$LSB_RELEASE --short --release`
-                case $DESC in
-                *openSUSE*)
-                        DISTRO=opensuse
-                    ;;
-                *Enterprise*)
-                        DISTRO=sles
-                        ;;
-                    esac
-                ;;
-            *)
-                DIST=unknown
-                DISTRO=unknown
-                ;;
-            esac
-
-        }
-
+        # this exists in scripts/build_utils.sh
         get_rpm_dist
 
         REPO=rpm-repo