diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2020-04-02 21:29:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 21:29:32 +1000 |
| commit | 71290d9cb904e8ea08456e5c4ab24bc274e593bf (patch) | |
| tree | 0bd864250166ecb22196653e76f9313d546f31a4 | |
| parent | 6ab584a3b6a5be68e779cc8e89c281c3438bd244 (diff) | |
Fix broken Fedora 30/31 RPM builds (#8572)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | .travis/package_management/trigger_rpm_lxc_build.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 98b5919846..f3dd60034f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -329,6 +329,7 @@ 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 @@ -337,6 +338,7 @@ 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 f9e109c729..2da51cfaf4 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", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']]) +common.run_command(container, ["sudo", "-E", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']]) print('Done!') |