]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
kernel: drop local get_rpm_dist() definition 1963/head
authorIlya Dryomov <idryomov@gmail.com>
Tue, 1 Feb 2022 18:32:57 +0000 (19:32 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 1 Feb 2022 18:38:20 +0000 (19:38 +0100)
The local definition is missing a couple of things, most notably
CentOSStream addition from commit d4dfd1210124 ("scripts: Support
CentOS Stream").  This fixes repository creation breakage caused
by DIST and DISTRO set to unknown.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
kernel/build/build_rpm

index 366699fb34a9002a4c11bb219493be67bf510258..db01292945f709644058c376fecbdbce0a4c9b83 100644 (file)
@@ -3,51 +3,6 @@ set -ex
 
 cd $WORKSPACE
 
-get_rpm_dist() {
-    LSB_RELEASE=/usr/bin/lsb_release
-    [ ! -x $LSB_RELEASE ] && echo unknown && exit
-
-    ID=`$LSB_RELEASE --short --id`
-
-    case $ID in
-    RedHatEnterpriseServer)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
-        DIST=rhel$RELEASE
-        DISTRO=rhel
-        ;;
-    CentOS)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
-        DIST=el$RELEASE
-        DISTRO=centos
-        ;;
-    Fedora)
-        RELEASE=`$LSB_RELEASE --short --release`
-        DIST=fc$RELEASE
-        DISTRO=fedora
-        ;;
-    SUSE\ LINUX)
-        DESC=`$LSB_RELEASE --short --description`
-        RELEASE=`$LSB_RELEASE --short --release`
-        case $DESC in
-        *openSUSE*)
-                DIST=opensuse$RELEASE
-                DISTRO=opensuse
-            ;;
-        *Enterprise*)
-                DIST=sles$RELEASE
-                DISTRO=sles
-                ;;
-            esac
-        ;;
-    *)
-        DIST=unknown
-        DISTRO=unknown
-        ;;
-    esac
-
-    echo $DIST
-}
-
 get_rpm_dist
 
 chacra_endpoint="kernel/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"