From 5aa077b485d7d96c47d8757d31904b38596249f6 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 23 Jun 2021 16:01:20 +0000 Subject: [ci] Update build_rpm scripts * Update to collectd-5.12 * Use systems/$os/$version/build_base_machine.sh to install requirements * Add patch for updating collectd/contrib/redhat/collectd.spec instead of using sed Change-Id: I4be4f5ef116d2e61ef1468b4009fcc7a52d9593a Signed-off-by: Emma Foley --- ci/utility/collectd_build_rpm.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ci/utility/collectd_build_rpm.sh') 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 + -- cgit 1.2.3-korg