diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/package_management/trigger_rpm_lxc_build.py | 2 | ||||
| -rw-r--r-- | netdata.spec.in | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index f3dd60034f..98b5919846 100644 --- a/.travis.yml +++ b/.travis.yml @@ -329,7 +329,6 @@ jobs: <<: *RPM_TEMPLATE if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/ env: - - CFLAGS="-fPIC" - BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="31" BUILD_STRING="fedora/31" - PACKAGE_TYPE="rpm" REPO_TOOL="dnf" - ALLOW_SOFT_FAILURE_HERE=true @@ -338,7 +337,6 @@ jobs: <<: *RPM_TEMPLATE if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/ env: - - CFLAGS="-fPIC" - BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="30" BUILD_STRING="fedora/30" - PACKAGE_TYPE="rpm" REPO_TOOL="dnf" - ALLOW_SOFT_FAILURE_HERE=true diff --git a/.travis/package_management/trigger_rpm_lxc_build.py b/.travis/package_management/trigger_rpm_lxc_build.py index 2da51cfaf4..f9e109c729 100755 --- a/.travis/package_management/trigger_rpm_lxc_build.py +++ b/.travis/package_management/trigger_rpm_lxc_build.py @@ -50,6 +50,6 @@ common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "rpmdev # Run the build process on the container print("Starting RPM build process") -common.run_command(container, ["sudo", "-E", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']]) +common.run_command(container, ["sudo", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']]) print('Done!') diff --git a/netdata.spec.in b/netdata.spec.in index 1d6126d0af..bc5ef0f988 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -233,8 +233,8 @@ happened, on your systems and applications. %prep %setup -q -n %{name}-%{version} -${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version} -${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version} +export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version} +export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version} %build # Conf step |