X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Futility%2Fcollectd_build_rpm.sh;fp=ci%2Futility%2Fcollectd_build_rpm.sh;h=a261c29250eff2ba89eda5725b63bd1ce21edfa2;hb=5aa077b485d7d96c47d8757d31904b38596249f6;hp=db7978692723019552976e6dd7bf524cff67539c;hpb=7d4a71a97701f55da94796c7ea6720e413a22de7;p=barometer.git diff --git a/ci/utility/collectd_build_rpm.sh b/ci/utility/collectd_build_rpm.sh index db797869..a261c292 100755 --- a/ci/utility/collectd_build_rpm.sh +++ b/ci/utility/collectd_build_rpm.sh @@ -32,14 +32,14 @@ make dist cp $COLLECTD_DIR/collectd-$VERSION.tar.bz2 $RPM_WORKDIR/SOURCES/ +git apply $DIR/collectd.spec.patch + sed --regexp-extended \ --in-place=".bak" \ - --expression="s/Version:\s+\S+$/Version: $VERSION/g" \ + --expression="s/Version:\s+\S+$/Version: $VERSION/g" \ $COLLECTD_DIR/contrib/redhat/collectd.spec -sed --regexp-extended \ - --in-place \ - --expression="s/without_intel_rdt:[0-9]/without_intel_rdt:1/g" \ - $COLLECTD_DIR/contrib/redhat/collectd.spec +dnf builddep -y $COLLECTD_DIR/contrib/redhat/collectd.spec rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec +