Merge "Updates/Fix on Legal/License Headers"

[barometer.git] / ci / utility / collectd_build_rpm.sh

diff --git a/ci/utility/collectd_build_rpm.sh b/ci/utility/collectd_build_rpm.sh
index 086aa97..db79786 100755 (executable)
--- a/ci/utility/collectd_build_rpm.sh
+++ b/ci/utility/collectd_build_rpm.sh
@@ -1,28 +1,33 @@
 #!/bin/bash
-# Copyright 2017 Intel Corporation and OPNFV
+# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $DIR/package-list.sh
 
 VERSION="VERSION_NOT_SET"
 
-rm -rf $RPM_WORKDIR
 cd $COLLECTD_DIR
-VERSION=$( $COLLECTD_DIR/version-gen.sh | sed "s/\W$//g" )
+VERSION=$( $COLLECTD_DIR/version-gen.sh )
+$COLLECTD_DIR/clean.sh
 $COLLECTD_DIR/build.sh
 $COLLECTD_DIR/configure
+sed     --regexp-extended \
+        --in-place=".bak" \
+        --expression="s/^CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_RAWIO/g" \
+        $COLLECTD_DIR/contrib/systemd.collectd.service
 make dist
 
 cp $COLLECTD_DIR/collectd-$VERSION.tar.bz2 $RPM_WORKDIR/SOURCES/
@@ -37,4 +42,4 @@ sed   --regexp-extended \
        --expression="s/without_intel_rdt:[0-9]/without_intel_rdt:1/g" \
        $COLLECTD_DIR/contrib/redhat/collectd.spec
 
-rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec
\ No newline at end of file
+rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec