From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 5 Sep 2016 11:26:59 +0000 (+0200)
Subject: buildpackages/make-rpm.sh: use /etc/os-release
X-Git-Tag: v11.1.1~58^2^2~111^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44d9acb67742db6f96f7daa5620d69afd657471f;p=ceph.git

buildpackages/make-rpm.sh: use /etc/os-release

The lsb_release binary is deprecated and requires installation of packages.

The /etc/os-release file is guaranteed to be present.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/tasks/buildpackages/make-rpm.sh b/tasks/buildpackages/make-rpm.sh
index fb3f821d14a..27a2b5c965c 100755
--- a/tasks/buildpackages/make-rpm.sh
+++ b/tasks/buildpackages/make-rpm.sh
@@ -43,10 +43,9 @@ source $(dirname $0)/common.sh
 
 init_ceph $git_ceph_url $sha1
 
-#id=$(lsb_release -s -i | tr A-Z a-z)
-#major=$(lsb_release -s -r | sed -s "s;\..*;;g")
-#codename="${id}${major}"
-releasedir=$base/$(lsb_release -si | tr ' ' '_')/WORKDIR
+distro=$( source /etc/os-release ; echo $ID )
+distro_version=$( source /etc/os-release ; echo $VERSION )
+releasedir=$base/$distro/WORKDIR
 #
 # git describe provides a version that is
 # a) human readable
@@ -67,7 +66,7 @@ function setup_rpmmacros() {
     if ! grep -q find_debuginfo_dwz_opts $HOME/.rpmmacros ; then
         echo '%_find_debuginfo_dwz_opts %{nil}' >> $HOME/.rpmmacros
     fi
-    if lsb_release -d -s | grep CentOS | grep -q 'release 7' ; then
+    if [ "x${distro}x" = "xcentosx" ] && echo $distro_version | grep -q '7' ; then
         if ! grep -q '%dist .el7' $HOME/.rpmmacros ; then
             echo '%dist .el7' >> $HOME/.rpmmacros
         fi