Correctly fixed RPM package builds on Fedora. (#8595)
* Revert "Fix broken Fedora 30/31 RPM builds (#8572)" This reverts commit 71290d9cb904e8ea08456e5c4ab24bc274e593bf. It didn't actually fix things and caused a different set of issues. * Build LWS and mosquitto with -fPIC in RPM builds. This fixeslinking errors that are currently causing RPM package build failures for Fedora 30/31.
Austin S. Hemmelgarn committed
Apr 3, 2020 at 11:40 UTC
1841d37354138184b0182751ac9262bc562c5843
3 files changed
+3
-5
.travis.yml
-2
@@ -329,7 +329,6 @@ jobs:
329
<<: *RPM_TEMPLATE
330
if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
331
env:
332
- - CFLAGS="-fPIC"
332
- BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="31" BUILD_STRING="fedora/31"
333
- PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
334
- ALLOW_SOFT_FAILURE_HERE=true
@@ -338,7 +337,6 @@ jobs:
337
<<: *RPM_TEMPLATE
338
if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
339
env:
341
- - CFLAGS="-fPIC"
340
- BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="30" BUILD_STRING="fedora/30"
341
- PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
342
- 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", "-E", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
53
+common.run_command(container, ["sudo", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
54
55
print('Done!')
netdata.spec.in
+2
-2
@@ -233,8 +233,8 @@ happened, on your systems and applications.
233
234
%prep
235
%setup -q -n %{name}-%{version}
236
-${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
237
-${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
236
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
237
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
238
239
%build
240
# Conf step