Fix broken Fedora 30/31 RPM builds (#8572)
James Mills committed
Apr 2, 2020 at 21:29 UTC
71290d9cb904e8ea08456e5c4ab24bc274e593bf
2 files changed
+3
-1
.travis.yml
+2
@@ -329,6 +329,7 @@ jobs:
329
<<: *RPM_TEMPLATE
330
if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
331
env:
332
+ - CFLAGS="-fPIC"
333
- BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="31" BUILD_STRING="fedora/31"
334
- PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
335
- ALLOW_SOFT_FAILURE_HERE=true
@@ -337,6 +338,7 @@ jobs:
338
<<: *RPM_TEMPLATE
339
if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
340
env:
341
+ - CFLAGS="-fPIC"
342
- BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="30" BUILD_STRING="fedora/30"
343
- PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
344
- ALLOW_SOFT_FAILURE_HERE=true
.travis/package_management/trigger_rpm_lxc_build.py
+1
-1
@@ -50,6 +50,6 @@ common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "rpmdev
50
51
# Run the build process on the container
52
print("Starting RPM build process")
53
-common.run_command(container, ["sudo", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
53
+common.run_command(container, ["sudo", "-E", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
54
55
print('Done!')