diff options
| author | Nathan Cutler <ncutler@suse.com> | 2018-01-29 13:38:08 +0100 |
|---|---|---|
| committer | Tim Serong <tserong@suse.com> | 2022-10-25 00:49:50 +0200 |
| commit | dfc9ef6886ae5de6b769979ebad46f5a81bcfaba (patch) | |
| tree | 9f63cd8d59af08a806d0ab2803c2ca1a6a8a5f28 /make-dist | |
| parent | Merge pull request #46188 from Zhiwei-Dai/wip-rgw-crypto-stack-on-compress (diff) | |
| download | ceph-dfc9ef6886ae5de6b769979ebad46f5a81bcfaba.tar.xz ceph-dfc9ef6886ae5de6b769979ebad46f5a81bcfaba.zip | |
make-dist: don't set Release tag in ceph.spec for SUSE distros
SUSE's Open Build Service overwrites the Release tag with checkin
and build counters, so we can't use it to record the number of
commits since the last tag, and the last commit hash. This commit
appends that extra information to the Version tag instead for
SUSE builds.
Fixes: https://tracker.ceph.com/issues/57893
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/make-dist b/make-dist index f2626871534..22bf2c98c00 100755 --- a/make-dist +++ b/make-dist @@ -168,6 +168,19 @@ echo "including src/.git_version, ceph.spec" (git rev-parse HEAD ; echo $version) 2> /dev/null > src/.git_version +if [ -r /etc/os-release ]; then + source /etc/os-release + case $ID in + opensuse*|suse|sles) + if [ "x$rpm_release" != "x0" ] ; then + rpm_release=$(echo $rpm_release | sed 's/.g/+g/') + rpm_version="${rpm_version}.${rpm_release}" + rpm_release="0" + fi + ;; + esac +fi + for spec in ceph.spec.in; do cat $spec | sed "s/@PROJECT_VERSION@/$rpm_version/g" | |