From 8aeba6580eb9b0b64f480f9b92d9da864e7ace11 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 1 Feb 2022 19:32:57 +0100 Subject: [PATCH] kernel: drop local get_rpm_dist() definition 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 --- kernel/build/build_rpm | 45 ------------------------------------------ 1 file changed, 45 deletions(-) diff --git a/kernel/build/build_rpm b/kernel/build/build_rpm index 366699fb..db012929 100644 --- a/kernel/build/build_rpm +++ b/kernel/build/build_rpm @@ -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}" -- 2.39.5